Re-enabled error handling to get more logging info