Minor fixes, and catch exceptions for replies.