Finally statements are causing errors in the peer system.

This should fix #3406