diff --git a/CHANGES.txt b/CHANGES.txt
index 6170dadccf6..91095ec9f82 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -155,6 +155,8 @@ Bug Fixes
  9. field boosts weren't being applied and doc boosts were being applied to fields (klaas)
 10. Multiple-doc update generates well-formed xml (klaas, SOLR-65)
 11. Better parsing of pingQuery from solrconfig.xml (hossman, SOLR-70)
+12. Fixed bug with "Distribution" page introduced when Versions were
+    added to "Info" page (hossman)
 
 Other Changes
  1. Upgrade to Lucene 2.0 nightly build 2006-06-22, lucene SVN revision 416224,
diff --git a/src/webapp/resources/admin/_info.jsp b/src/webapp/resources/admin/_info.jsp
index 79f4d4639d0..95fc14cf12f 100644
--- a/src/webapp/resources/admin/_info.jsp
+++ b/src/webapp/resources/admin/_info.jsp
@@ -43,45 +43,54 @@
   InetAddress addr = InetAddress.getLocalHost();
   String hostname = addr.getCanonicalHostName();
 
-  StringWriter tmp;
-
-  tmp = new StringWriter();
-  XML.escapeCharData(SolrConfig.config.get("admin/defaultQuery/text()", null),
-                     tmp);
-  String defaultSearch = tmp.toString();
-
-  Package p;
-
-  p = SolrCore.class.getPackage();
-
-  tmp = new StringWriter();
-  String solrImplVersion = p.getImplementationVersion();
-  if (null != solrImplVersion) {
-    XML.escapeCharData(solrImplVersion, tmp);
-    solrImplVersion = tmp.toString();
-  }
-  tmp = new StringWriter();
-  String solrSpecVersion = p.getSpecificationVersion() ;
-  if (null != solrSpecVersion) {
-    XML.escapeCharData(solrSpecVersion, tmp);
-    solrSpecVersion = tmp.toString();
+  String defaultSearch = "";
+  { 
+    StringWriter tmp = new StringWriter();
+    XML.escapeCharData
+      (SolrConfig.config.get("admin/defaultQuery/text()", null), tmp);
+    defaultSearch = tmp.toString();
   }
 
-  p = LucenePackage.class.getPackage();
+  String solrImplVersion = "";
+  String solrSpecVersion = "";
+  String luceneImplVersion = "";
+  String luceneSpecVersion = "";
 
-  tmp = new StringWriter();
-  String luceneImplVersion = p.getImplementationVersion();
-  if (null != luceneImplVersion) {
-    XML.escapeCharData(luceneImplVersion, tmp);
-    luceneImplVersion = tmp.toString();
-  }
-  tmp = new StringWriter();
-  String luceneSpecVersion = p.getSpecificationVersion() ;
-  if (null != luceneSpecVersion) {
-    XML.escapeCharData(luceneSpecVersion, tmp);
-    luceneSpecVersion = tmp.toString();
-  }
+  { 
+    Package p;
+    StringWriter tmp;
 
+    p = SolrCore.class.getPackage();
+
+    tmp = new StringWriter();
+    solrImplVersion = p.getImplementationVersion();
+    if (null != solrImplVersion) {
+      XML.escapeCharData(solrImplVersion, tmp);
+      solrImplVersion = tmp.toString();
+    }
+    tmp = new StringWriter();
+    solrSpecVersion = p.getSpecificationVersion() ;
+    if (null != solrSpecVersion) {
+      XML.escapeCharData(solrSpecVersion, tmp);
+      solrSpecVersion = tmp.toString();
+    }
+  
+    p = LucenePackage.class.getPackage();
+
+    tmp = new StringWriter();
+    luceneImplVersion = p.getImplementationVersion();
+    if (null != luceneImplVersion) {
+      XML.escapeCharData(luceneImplVersion, tmp);
+      luceneImplVersion = tmp.toString();
+    }
+    tmp = new StringWriter();
+    luceneSpecVersion = p.getSpecificationVersion() ;
+    if (null != luceneSpecVersion) {
+      XML.escapeCharData(luceneSpecVersion, tmp);
+      luceneSpecVersion = tmp.toString();
+    }
+  }
+  
   String cwd=System.getProperty("user.dir");
   String solrHome= Config.getInstanceDir();
 %>