Prevented exception which appears on edit item
Merge branch 'master' into rc2.0.10