Is there any other alternative to adding the exception message here?

Also, wondering if this catches all error cases.

BTW, thanks for digging into this long standing issue