[ros-diffs] [gschneider] 42866: Check the surface pointer before accessing it to get a handle