[RJA-2907][fix] - Handling nulls correctly
Merge pull request #1049 from rsvato/master

[RJA-2907][fix] - Handling nulls correctly