Fix shutdown and error path bugs in the rpz unit

This MR fixes a bug described in #3735 (closed), and two three other similar bugs discovered during the investigation.

Closes #3735 (closed)