Prevent NPEs when changing units on cross sections [1560]