Minore fix to make sure that shipping data is always present