diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AbstractTracker.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AbstractTracker.java
index e08a9d7b3..b55f3702c 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AbstractTracker.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AbstractTracker.java
@@ -168,7 +168,7 @@ public abstract class AbstractTracker implements Tracker
             catch(IndexTrackingShutdownException t)
             {
                 setRollback(true);
-                log.info("Stopping index tracking for "+coreName);
+                log.info("Stopping index tracking for " + getClass().getSimpleName() + " - " + coreName);
             }
             catch(Throwable t)
             {
@@ -178,23 +178,23 @@ public abstract class AbstractTracker implements Tracker
                     if (log.isDebugEnabled())
                     {
                         // DEBUG, so give the whole stack trace
-                        log.warn("Tracking communication timed out.", t);
+                        log.warn("Tracking communication timed out for " + getClass().getSimpleName() + " - " + coreName, t);
                     }
                     else
                     {
                         // We don't need the stack trace.  It timed out.
-                        log.warn("Tracking communication timed out.");
+                        log.warn("Tracking communication timed out for " + getClass().getSimpleName() + " - " + coreName);
                     }
                 }
                 else
                 {
-                    log.error("Tracking failed", t);
+                    log.error("Tracking failed for " + getClass().getSimpleName() + " - " + coreName, t);
                 }
             }
         }
         catch (InterruptedException e)
         {
-            log.error("Semaphore interrupted", e);
+            log.error("Semaphore interrupted for " + getClass().getSimpleName() + " - " + coreName, e);
         }
         finally
         {
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java
index 8abbf9dd0..29f55f8f4 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java
@@ -268,7 +268,7 @@ public class ModelTracker extends AbstractTracker implements Tracker
         }
         catch (Throwable t)
         {
-            log.error("Model tracking failed", t);
+            log.error("Model tracking failed for core: "+ coreName, t);
         }
 
     }