Add basic Error handling.