Resharper refactoring and moved Null utility class.