Marginally less strange exception message
Merge branch 'master' of github.com:Tradeshift/spiritual-gui