Replaced call with uncaught exception with a call that handles the exception
Merge pull request #118 from pfschwartz/develop

Replaced call with uncaught exception with a call that handles the excep...