removed bogus null return