diff --git a/src/nl/surf/eduhub_rio_mapper/cli_commands.clj b/src/nl/surf/eduhub_rio_mapper/cli_commands.clj
index fbdcd3a9..83317fee 100644
--- a/src/nl/surf/eduhub_rio_mapper/cli_commands.clj
+++ b/src/nl/surf/eduhub_rio_mapper/cli_commands.clj
@@ -104,15 +104,14 @@
                                     first
                                     :kenmerkwaardeTekst)]
             (when (not= nieuwe-sleutel (str uuid))
-              (println "Failed to set eigenOpleidingseenheidSleutel to" nieuwe-sleutel)
-              (println "The RIO Queue is DOWN")
+              (throw (ex-info "Failed to set eigenOpleidingseenheidSleutel" {:rio-queue-status :down}))
               (System/exit 255))))
 
         (println "The RIO Queue is UP")
         (catch Exception ex
           (when-let [ex-data (ex-data ex)]
             (when (= :down (:rio-queue-status ex-data))
-              (println "The RIO Queue is DOWN")
+              (println "The RIO Queue is DOWN;" (.getMessage ex))
               (System/exit 255)))
           (println "An unexpected exception has occurred: " ex)
           (System/exit 254))))