added protection from NPE#21

Alexander198961 wants to merge 1 commit intodieselpoint:masterdieselpoint/norm:masterfrom

Alexander198961:fix_npeAlexander198961/norm:fix_npeCopy head branch name to clipboard