Changed Error Handling, compiled