Trying to fix error handling. Refs #33.