Fixed for null bootstrapper
Fix for 8.0