Better error handling
Merge branch 'master' into query-creation