Improved error handling #170

Improved error handling #170