diff --git a/client/rr_client.c b/client/rr_client.c
index 5ef95946..6161a41b 100644
--- a/client/rr_client.c
+++ b/client/rr_client.c
@@ -131,34 +131,8 @@ void my_connect_callback(struct mosquitto *mosq, void *obj, int result, int flag
 
 void my_subscribe_callback(struct mosquitto *mosq, void *obj, int mid, int qos_count, const int *granted_qos)
 {
-	int rc = MOSQ_ERR_SUCCESS;
-
 	if(granted_qos[0] < 128){
 		client_state = rr_s_ready_to_publish;
-
-		if(rc){
-			if(!cfg.quiet){
-				switch(rc){
-					case MOSQ_ERR_INVAL:
-						fprintf(stderr, "Error: Invalid input. Does your topic contain '+' or '#'?\n");
-						break;
-					case MOSQ_ERR_NOMEM:
-						fprintf(stderr, "Error: Out of memory when trying to publish message.\n");
-						break;
-					case MOSQ_ERR_NO_CONN:
-						fprintf(stderr, "Error: Client not connected when trying to publish.\n");
-						break;
-					case MOSQ_ERR_PROTOCOL:
-						fprintf(stderr, "Error: Protocol error when communicating with broker.\n");
-						break;
-					case MOSQ_ERR_PAYLOAD_SIZE:
-						fprintf(stderr, "Error: Message payload is too large.\n");
-						break;
-				}
-			}
-			client_state = rr_s_disconnect;
-			mosquitto_disconnect_v5(mosq, 0, cfg.disconnect_props);
-		}
 	}else{
 		client_state = rr_s_disconnect;
 		if(!cfg.quiet){
diff --git a/src/security.c b/src/security.c
index 67abd118..1440c6ad 100644
--- a/src/security.c
+++ b/src/security.c
@@ -836,11 +836,7 @@ int mosquitto_security_auth_start(struct mosquitto_db *db, struct mosquitto *con
 		}
 	}
 
-	if(rc == MOSQ_ERR_PLUGIN_DEFER){
-		return MOSQ_ERR_NOT_SUPPORTED;
-	}else{
-		return rc;
-	}
+	return MOSQ_ERR_NOT_SUPPORTED;
 }
 
 
@@ -883,9 +879,5 @@ int mosquitto_security_auth_continue(struct mosquitto_db *db, struct mosquitto *
 		}
 	}
 
-	if(rc == MOSQ_ERR_PLUGIN_DEFER){
-		return MOSQ_ERR_NOT_SUPPORTED;
-	}else{
-		return rc;
-	}
+	return MOSQ_ERR_NOT_SUPPORTED;
 }