fix for #22

Revert "fix for #22"

This reverts commit e699adc35aeca763ead2f698656f44a2517654aa.

fix for NSNull crashes see #22