(Bug 4855) Do not proceed when we fail

When we fail, cut it short. Don't continue.