Refactor Exception Handling Flow

[GLaDAP]

The current flow catches and throws a new exception, hiding the actual cause of the exception. Refactor the exception handling so the underlying error is clear to the end user