DEVIDM-82 - Fixed broken test
DEVIDM-82 - Null checks.