fixed a merge bug (causing regressions in NullReferenceTest et al)
1 file changed