FIX: Added checks to prevent NullReferenceException
#2364
+2
−1
NullReferenceException
#2364