Improved logging, avoid fatal error