Fixed check for nulls