DDF-374: Added additional logging and null checks.

Also made some convenience methods per peer review.