Add additional checks to GLSurface