Fix the way error is handled by bootstrap