Fixed condition mistake when System is null in fix for #23