Should this be an actual null-check? Or is this internal enough that we only need the check while our tests are running?