diff --git a/Modules/Core/ComponentInterface/src/ComponentSelector.cxx b/Modules/Core/ComponentInterface/src/ComponentSelector.cxx
index 7c884e80fb5faa1ca22def7e5f1c410297444839..23323c08821e27aa8dcbec9d92ac34cd6377e1a8 100644
--- a/Modules/Core/ComponentInterface/src/ComponentSelector.cxx
+++ b/Modules/Core/ComponentInterface/src/ComponentSelector.cxx
@@ -80,12 +80,12 @@ ComponentSelector::NumberOfComponentsType ComponentSelector::UpdatePossibleCompo
     message << "Too many criteria for component. There is no component in our database that fulfills this set of criteria: " << std::endl;
     for (CriteriaType::const_iterator criterion = this->m_Criteria.begin(); criterion != this->m_Criteria.cend(); ++criterion)
     {
-      message << "  " << criterion->first << " : {";
+      message << "  " << criterion->first << " : { ";
           for (auto const & criterionValue : criterion->second) // auto&& preferred?
           {
             message << criterionValue << " ";
           }
-          message << " }" << std::endl;
+          message << "}" << std::endl;
     }   
     std::cout << message.str();
 
diff --git a/Testing/Unit/elxRegistrationItkv4Test.cxx b/Testing/Unit/elxRegistrationItkv4Test.cxx
index 2458204cffd0f888f8608b038e874fdbfec30cf0..59ac2f1a56baf4f49bd17a7975c991e15e61364c 100644
--- a/Testing/Unit/elxRegistrationItkv4Test.cxx
+++ b/Testing/Unit/elxRegistrationItkv4Test.cxx
@@ -108,7 +108,7 @@ TEST_F(RegistrationItkv4Test, ImagesOnly)
   bool allUniqueComponents;
   EXPECT_NO_THROW(allUniqueComponents = overlord->Configure());
   EXPECT_TRUE(allUniqueComponents);
-  //EXPECT_NO_THROW(overlord->Execute());
+  EXPECT_NO_THROW(overlord->Execute());
   
 }