Updated log messages, removed nullpointerexception