Extra error handling and added elmah