Revert "remove the catch all"

This reverts commit 0724392c497527fd613c192d18a3f23bf0ae8986.