Revert "Avoid an additional exception type check"
Revert "Avoid an additional exception type check"

This reverts commit 8e662df6202e44a20a1af0951498c034acd88ddd.

CartoDB/cartodb,splashblot/dronedb,CartoDB/cartodb,CartoDB/cartodb,splashblot/dronedb,splashblot/dronedb,CartoDB/cartodb,splashblot/dronedb,splashblot/dronedb,CartoDB/cartodb