DDF-489: Added null checks and upped test logging.