diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java b/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
index 7f21a1538e..04ccbce98d 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
@@ -217,6 +217,10 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
             {
                 return "Unavailable: " + e.getMessage();
             }
+            catch (IllegalArgumentException iae)
+            {
+                return "Unavailable: " + iae.getMessage();
+            }
         }
         else
         {