Prevent duplicate error messages on AJAX failures
Merge branch 'master' into imp_6_1
Better check