Merge change I7f97011b into eclair-mr2

* changes:
  check for native initialization before calling public function