FS-777: Fix ns null crash