Stop trying to catch everything

This is part of #4