Replace catch block with something a lot less stupid.
Merge branch 'reduce-stupidity' of github.com:Bombe/fred-staging into next