Merge branch 'ChrisSmith-652_Fix' into dev

cherry picked 429745f that fixed the NPE