Avoid error on handling error - but there must be a better way?

Avoid error on handling error - but there must be a better way? #66