Merge branch 'ChrisSmith-652_Fix' into dev
Merge pull request #1 from motain/issue-IA-280-NPE

Merge branch 'ChrisSmith-652_Fix' into dev