fixed

username-removed-85354 requested to merge hotfix/npe-fix into master Jun 21, 2016