Fixed a NullReferenceException and naming
Implemented SA1409 Code Fix