MEDIUM / Improved management of NullReferenceException