diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp
index 2679d031e..3f3ec9e9e 100644
--- a/lib/base/exception.cpp
+++ b/lib/base/exception.cpp
@@ -243,7 +243,11 @@ String icinga::DiagnosticInformation(const std::exception& ex, bool verbose, Sta
 		}
 	}
 
-	if (boost::get_error_info<ContextTraceErrorInfo>(ex) == NULL) {
+	const ContextTrace *ct = boost::get_error_info<ContextTraceErrorInfo>(ex);
+
+	if (ct) {
+		result << *ct;
+	} else {
 		result << std::endl;
 
 		if (!context)