Merge pull request #457 from norv/cleanups

Error log fix