DF#QCADOOMES-1922 fix npe
Merge branch 'dev' of https://github.com/qcadoo/mes into dev