[lipstick] Guard against using a null surface