Repair fix for NULL