Improved Exception catch