PUP-3561 add exception catch and wrapping into known exception type