Some exceptions weren't being caught properly.