Add a heuristic to check if we need to defer vehicle creation

Add a heuristic to check if we need to defer vehicle creation #232