FS-28 Extra nullchecks