Better error stuff
Merge branch 'master' into io-2013