SCISOFT NCD: SCI-1562 add NPE protection
SCISOFT NCD: SCI-1562 improve processing data type setting consistency
and minor refactoring