Better handling of communication errors and user changes