Add error handling in quick edit. Bug #63529
Merge branch 'master' into ascraeus