Fix EXCEPTION_CATCHING_WHITELIST (#1623)

Fix the errors in #1623 caused by missing checks.
Is this alright or should I change these checks to only look in the whitelist if ```DISABLE_EXCEPTION_CATCHING == 2```?