Bug 846962 - Quick hack to ensure .ondata is not accessed when null r=kg...

...randon