Nullchecks and surface grabber layout update