diff --git a/lib/SimpleSAML/Error/NoPassive.php b/lib/SimpleSAML/Error/NoPassive.php
index 73b5cd833a1604c11918e322c5a7e59f04e483e1..8966dc8b527497999edea34fc9db2cc47451fa1e 100644
--- a/lib/SimpleSAML/Error/NoPassive.php
+++ b/lib/SimpleSAML/Error/NoPassive.php
@@ -1,6 +1,14 @@
 <?php
 
 
+/**
+ * Class SimpleSAML_Error_NoPassive
+ *
+ * @deprecated This class has been deprecated and will be removed in SimpleSAMLphp 2.0. Please use
+ * SimpleSAML\Module\saml\Error\NoPassive instead.
+ *
+ * @see \SimpleSAML\Module\saml\Error\NoPassive
+ */
 class SimpleSAML_Error_NoPassive extends SimpleSAML_Error_Exception {
 
 }
diff --git a/lib/SimpleSAML/Error/ProxyCountExceeded.php b/lib/SimpleSAML/Error/ProxyCountExceeded.php
index bebe09321aa221b8f6987f0090ed139d57ce3aea..0af64d51e740db277e523d89284290d6b16a3122 100644
--- a/lib/SimpleSAML/Error/ProxyCountExceeded.php
+++ b/lib/SimpleSAML/Error/ProxyCountExceeded.php
@@ -1,6 +1,14 @@
 <?php
 
 
+/**
+ * Class SimpleSAML_Error_ProxyCountExceeded
+ *
+ * @deprecated This class has been deprecated and will be removed in SimpleSAMLphp 2.0. Please use
+ * SimpleSAML\Module\saml\Error\ProxyCountExceeded instead.
+ *
+ * @see \SimpleSAML\Module\saml\Error\ProxyCountExceeded
+ */
 class SimpleSAML_Error_ProxyCountExceeded extends SimpleSAML_Error_Exception {
 
 }
diff --git a/modules/saml/lib/Error.php b/modules/saml/lib/Error.php
index 0fe40639047faf1e054542c7859df78febc42df0..e5654eab9c6189809daa2c4e8f5b12522385f340 100644
--- a/modules/saml/lib/Error.php
+++ b/modules/saml/lib/Error.php
@@ -104,6 +104,7 @@ class sspmod_saml_Error extends SimpleSAML_Error_Exception {
 			// Return the original exception unchanged
 			return $exception;
 
+		// TODO: remove this branch in 2.0
 		} elseif ($exception instanceof SimpleSAML_Error_NoPassive) {
 			$e = new self(
 				\SAML2\Constants::STATUS_RESPONDER,
@@ -111,6 +112,7 @@ class sspmod_saml_Error extends SimpleSAML_Error_Exception {
 				$exception->getMessage(),
 				$exception
 				);
+		// TODO: remove this branch in 2.0
 		} elseif ($exception instanceof SimpleSAML_Error_ProxyCountExceeded) {
 			$e = new self(
 				\SAML2\Constants::STATUS_RESPONDER,