diff --git a/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/XaDataSourceService.java b/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/XaDataSourceService.java
index <HASH>..<HASH> 100644
--- a/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/XaDataSourceService.java
+++ b/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/XaDataSourceService.java
@@ -55,7 +55,9 @@ public class XaDataSourceService extends AbstractDataSourceService {
                 XAResourceRecoveryRegistry rr = transactionIntegrationValue.getValue().getRecoveryRegistry();
 
                 for (XAResourceRecovery recovery : deploymentMD.getRecovery()) {
-                    rr.removeXAResourceRecovery(recovery);
+                    if (recovery != null) {
+                        rr.removeXAResourceRecovery(recovery);
+                    }
                 }
             }
         }
AS7-<I> Failure during stop of DataSource service w/ recovery set to null