Add error handling and messaging #5