Updated the code so that it returns a valid value if an exception occurs
Bumped versions to include latest fixes