After 0c7c8f08, do an early return on error.

Otherwise the previous instruction would be added twice to Expansion
and who knows what doom that would spell.