This was also causing a crash if s2 is null.  I think it was a typo.