Last push fixed added error handling for unhndled exceptions