Merge change 22060 into eclair

* changes:
  better error handling in EGL