Add null skipping

Related to #710