COOPR-660
fix / null guard
COOPR-660: fix test failure
COOPR-660: add usage of constant
COOPR-660: improve field check
Merge pull request #853 from cybervisiontech/feature/coopr-660

COOPR-660: Resolve "invalid input" issue