[45607] Fixed possible NullReferenceException - fixes #31