Changed Error Query to true
Merge branch 'master' into CMD