Ensure  is always set. Closes #2517