handle mysql errors gracefully
Merge branch 'master' into rspec-tests