Fixing a corner case when scrap+init fails.
Feedback from review.