diff --git a/[refs] b/[refs]
index 85a68848614c4..59eb17c2ee5d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": 4fac52f4b72294d69ff89ec4b7297b685fb7f0ad
+"refs/heads/CMSSW_7_1_X": c8087074a5e3084bb382deb1b6842c8f81f5a39b
diff --git a/trunk/CondCore/DBCommon/interface/Exception.h b/trunk/CondCore/DBCommon/interface/Exception.h
index ffc3d921ba660..9dab7fcf3dbfd 100644
--- a/trunk/CondCore/DBCommon/interface/Exception.h
+++ b/trunk/CondCore/DBCommon/interface/Exception.h
@@ -1,3 +1,6 @@
+#ifdef COND_EXP_WARNING
+#warning please ignore previous warning
+#endif
 #ifndef COND_EXCEPTION_H
 #define COND_EXCEPTION_H
 #include "FWCore/Utilities/interface/Exception.h"
diff --git a/trunk/CondCore/DBOutputService/interface/PoolDBOutputService.h b/trunk/CondCore/DBOutputService/interface/PoolDBOutputService.h
index 859a92939a7c6..cf7c7e41c0289 100644
--- a/trunk/CondCore/DBOutputService/interface/PoolDBOutputService.h
+++ b/trunk/CondCore/DBOutputService/interface/PoolDBOutputService.h
@@ -14,9 +14,11 @@
 #include "CondFormats/Common/interface/PayloadWrapper.h"
 
 // many many clients do not include explicitely!
+#ifndef COND_EXCEPTION_H
 #include "CondCore/DBCommon/interface/Exception.h"
 #warning please include  "CondCore/DBCommon/interface/Exception.h" explicitely
-
+#define COND_EXP_WARNING
+#endif
 
 //#include <iostream>
 //