Don't swallow exceptions (and fix a test too)