diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java b/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
index 8d58a602..56d062a9 100644
--- a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
+++ b/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
@@ -514,12 +514,16 @@ public Session getCurrentSession() throws ConnectionNotFoundException {
     }
 
     @Override
-    public void destroy() throws Exception {
+    public void destroy() {
         try {
             super.destroy();
         } finally {
             GrailsDomainBinder.clearMappingCache();
-            this.gormEnhancer.close();
+            try {
+                this.gormEnhancer.close();
+            } catch (Exception e) {
+                LOG.error("There was an error shutting down GORM for an entity: " + e.getMessage(), e);
+            }
         }
     }