More logging
Fixed typo in Exception handling