Updated error handling refs #32