Better error handling. Partial... #69