[Bug 846962] Quick hack to ensure .ondata is not accessed when null r=kgrandon
Merge pull request #8502 from lightsofapollo/bug-846962-ondata

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