Merge "Protect against weird null case"