Fixes
Improved exceptions