diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp
index fa41bafe7..468f4fc5c 100644
--- a/lib/base/exception.cpp
+++ b/lib/base/exception.cpp
@@ -138,7 +138,7 @@ String icinga::DiagnosticInformation(const std::exception& ex, bool verbose, Sta
 
 	String message = ex.what();
 
-	if (verbose)
+	if (message.IsEmpty())
 		result << boost::diagnostic_information(ex);
 	else
 		result << "Error: " << message;