Merge "check for nulls"