Improve error logging
Version 0.1.1