Deal with getting stuck.

This commit addresses this in terms of visibility, defensiveness and a better healthcheck.