Adding @since 2.4 and removing unused null check