fixup! Catch signals to perform cleanup tasks

Yikes, a that previous commit was in an in-between state and should not
have been pushed!