diff --git a/marketplace-service/src/main/java/com/axonivy/market/entity/ProductMarketplaceData.java b/marketplace-service/src/main/java/com/axonivy/market/entity/ProductMarketplaceData.java
index 1ed7e79f..a791a6e6 100644
--- a/marketplace-service/src/main/java/com/axonivy/market/entity/ProductMarketplaceData.java
+++ b/marketplace-service/src/main/java/com/axonivy/market/entity/ProductMarketplaceData.java
@@ -10,7 +10,6 @@
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 import static com.axonivy.market.constants.EntityConstants.PRODUCT_MARKETPLACE_DATA;
 
diff --git a/marketplace-service/src/main/java/com/axonivy/market/service/impl/ProductServiceImpl.java b/marketplace-service/src/main/java/com/axonivy/market/service/impl/ProductServiceImpl.java
index 7f562225..f409513d 100644
--- a/marketplace-service/src/main/java/com/axonivy/market/service/impl/ProductServiceImpl.java
+++ b/marketplace-service/src/main/java/com/axonivy/market/service/impl/ProductServiceImpl.java
@@ -428,7 +428,7 @@ private Date getFirstTagPublishedDate(List<GHTag> gitHubTags) {
         }
       }
     } catch (IOException e) {
-      throw new RuntimeException(e);
+      log.error("Get first tag published date failed: ", e);
     }
 
     return firstTagPublishedDate;
@@ -441,11 +441,15 @@ private List<GHTag> sortByTagCommitDate(List<GHTag> gitHubTags) {
   }
 
   private Date sortByCommitDate(GHTag gitHubTag) {
+    Date commitDate = null;
     try {
-      return gitHubTag.getCommit() != null ? gitHubTag.getCommit().getCommitDate() : null;
+      if (gitHubTag.getCommit() != null) {
+        commitDate = gitHubTag.getCommit().getCommitDate();
+      }
     } catch (IOException e) {
-      throw new RuntimeException(e);
+      log.error("Get first tag published date failed: ", e);
     }
+    return commitDate;
   }
 
   private void updateProductFromReleasedVersions(Product product) {