Pull req: #308 small changes to logged messages and exception handling