diff --git a/oxo-indexer/application.properties b/oxo-indexer/application.properties
index e61c694..780409c 100644
--- a/oxo-indexer/application.properties
+++ b/oxo-indexer/application.properties
@@ -8,6 +8,7 @@ oxo.neo.uri=http://neo4j:dba@localhost:7474
 #bolt://neo4j:dba@localhost:7688
 
 spring.data.solr.host=http://localhost:8983/solr
+spring.main.web-environment=false
 
 oxo.indexer.chunks=100000
 
diff --git a/oxo-indexer/src/main/java/uk/ac/ebi/spot/indexer/SolrIndexer.java b/oxo-indexer/src/main/java/uk/ac/ebi/spot/indexer/SolrIndexer.java
index 8f6ac8b..03e7d1b 100644
--- a/oxo-indexer/src/main/java/uk/ac/ebi/spot/indexer/SolrIndexer.java
+++ b/oxo-indexer/src/main/java/uk/ac/ebi/spot/indexer/SolrIndexer.java
@@ -53,6 +53,6 @@ public void run(String... strings) throws Exception {
     }
 
     public static void main(String[] args) throws Exception {
-        SpringApplication.exit(SpringApplication.run(SolrIndexer.class, args));
+        SpringApplication.run(SolrIndexer.class, args);
     }
 }