Fixed the NPE (CAAERS-6487)
Merge branch 'master' of github.com:NCIP/caaers