Merge change I771bebb9 into eclair

* changes:
  Add Java exceptions to catch RS calls with no context or no surface.