Merge change Ic66f68a7 into eclair-mr2

* changes:
  Fix a null pointer exception caught by the monkey.