revert null check (requires Starcounter 2.0.2177.3)