Fixes #162.
It was in the wrong place the whole time. In fact, I'm not sure what error I was even trying to fix. There was already a catch in the correct place. I updated it though.
Merge remote-tracking branch 'origin/master'