Added Try-Catch