diff --git a/DDAlign/src/GlobalAlignmentStack.cpp b/DDAlign/src/GlobalAlignmentStack.cpp
index 846885e705eb702436805187bc094cde1ea21898..d6aaf8f4d1074d12625188a85e507e71f0c239dc 100644
--- a/DDAlign/src/GlobalAlignmentStack.cpp
+++ b/DDAlign/src/GlobalAlignmentStack.cpp
@@ -95,6 +95,7 @@ GlobalAlignmentStack::~GlobalAlignmentStack()   {
 GlobalAlignmentStack& GlobalAlignmentStack::get()  {
   if ( _stack().get() ) return *_stack();
   except("GlobalAlignmentStack", "Stack not allocated -- may not be retrieved!");
+  throw std::runtime_error("Stack not allocated");
 }
 
 /// Create an alignment stack instance. The creation of a second instance will be refused.
diff --git a/DDCond/src/ConditionsDependencyHandler.cpp b/DDCond/src/ConditionsDependencyHandler.cpp
index 29fd5c2ab40b5a6e7eb7bf560fd9eeafee67be26..97aee01fe9512660146186ccfe860580248da440 100644
--- a/DDCond/src/ConditionsDependencyHandler.cpp
+++ b/DDCond/src/ConditionsDependencyHandler.cpp
@@ -26,7 +26,7 @@ namespace {
     return d->target.name;
 #else
     char text[64];
-    ConditionKey::KeyMaker key(d->target.hash);
+    dd4hep::ConditionKey::KeyMaker key(d->target.hash);
     ::snprintf(text,sizeof(text),"%08X %08X",key.values.det_key, key.values.item_key);
     return text;
 #endif