Closes #82.
Closes #83.
Further simplified error handling. #82.