Improved some exceptions