HDFS-5224: remove unneeded null check