BUG-9915 Fixed check for null value in getMandatoryOption
Merge branch 'hotfix/BUG-9915'