NPE check added for task decision  adding
Merge remote-tracking branch 'origin/develop' into develop