handle null values correctly
release 1.0.1