Improve exception handling and be more verbose