Fixed possible NPE, improved logging.