Fix for fix regarding "Avoid NullReferenceException" - thx alfaproject :)