Added missing check on bootstrap