Error handling cleanups refs #9, #10