fix null options like it's done in 4.3 already
Merge pull request #608 from DarkSide666/patch-3

fix null options like it's done in 4.3 already