fix null options like it's done in 4.3 already