diff --git a/guacd/src/client.c b/guacd/src/client.c
index b2402783..1a92f884 100644
--- a/guacd/src/client.c
+++ b/guacd/src/client.c
@@ -171,6 +171,11 @@ void* __guac_client_input_thread(void* data) {
             return NULL;
         }
 
+        /* Reset guac_error and guac_error_message (client handlers are not
+         * guaranteed to set these) */
+        guac_error = GUAC_STATUS_SUCCESS;
+        guac_error_message = NULL;
+
         /* Call handler, stop on error */
         if (guac_client_handle_instruction(client, instruction) < 0) {