Try-Catch fix