Improved exception handling, fixed Short parsing