Add simple error handling for now