Added null skipping