Don't spin forever [IMMUTANT-319]

Also includes a typo fix.