diff --git a/src/main/java/zw/qantra/tm/domain/models/Provider.java b/src/main/java/zw/qantra/tm/domain/models/Provider.java
index cec8802..86b7ab4 100644
--- a/src/main/java/zw/qantra/tm/domain/models/Provider.java
+++ b/src/main/java/zw/qantra/tm/domain/models/Provider.java
@@ -3,7 +3,6 @@ package zw.qantra.tm.domain.models;
 import jakarta.persistence.Entity;
 import lombok.*;
 import org.hibernate.annotations.SQLRestriction;
-import org.hibernate.annotations.Where;
 
 
 @Entity
diff --git a/src/main/java/zw/qantra/tm/domain/workflows/handlers/IntegrationHandler.java b/src/main/java/zw/qantra/tm/domain/workflows/handlers/IntegrationHandler.java
index fd750e3..54515c3 100644
--- a/src/main/java/zw/qantra/tm/domain/workflows/handlers/IntegrationHandler.java
+++ b/src/main/java/zw/qantra/tm/domain/workflows/handlers/IntegrationHandler.java
@@ -39,6 +39,9 @@ public class IntegrationHandler implements HandlerInterface {
         if(transaction.getIntegrationStatus().equals(Status.SUCCESS))
             return transaction;
 
+        if(!transaction.getPollingStatus().equals(Status.SUCCESS))
+            throw new ApiException("Transaction failed: Polling is not yet complete" );
+
         // prevent race condition
         if (isLocked(transaction.getId().toString())) {
             logger.info("Transaction already processing - {}", transaction.getId());
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 77be2db..4e4c1cd 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -42,4 +42,4 @@
     <logger name="org.springframework" level="WARN" />
     <logger name="org.hibernate" level="WARN" />
     <logger name="org.apache" level="WARN" />
-</configuration> 
\ No newline at end of file
+</configuration>
\ No newline at end of file