Compatability with error row in queries
Merge origin/master