diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
index 22e67de435f..08a66c15be1 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
@@ -1087,7 +1087,7 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
 			b.append(" (pid ");
 			b.append(theEntity.getId());
 			b.append(", version ");
-			b.append(myContext.getVersion().getVersion());
+			b.append(theEntity.getFhirVersion().name());
 			b.append("): ");
 			b.append(e.getMessage());
 			String msg = b.toString();
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java
index c1770e5cb03..051ee0bdeb7 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java
@@ -21,12 +21,7 @@ import static org.apache.commons.lang3.StringUtils.isBlank;
  * limitations under the License.
  * #L%
  */
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 
 import javax.persistence.Query;
@@ -59,7 +54,6 @@ import ca.uhn.fhir.rest.method.RequestDetails;
 import ca.uhn.fhir.rest.server.IBundleProvider;
 import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
 import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetails;
-import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
 
 public abstract class BaseHapiFhirSystemDao<T, MT> extends BaseHapiFhirDao<IBaseResource> implements IFhirSystemDao<T, MT> {
 
@@ -278,9 +272,9 @@ public abstract class BaseHapiFhirSystemDao<T, MT> extends BaseHapiFhirDao<IBase
 	
 	@Override
 	@Transactional(propagation = Propagation.NOT_SUPPORTED)
-	public int performReindexingPass(final Integer theCount) {
+	public Integer performReindexingPass(final Integer theCount) {
 		if (!myReindexLock.tryLock()) {
-			return 0;
+			return null;
 		}
 		try {
 			return doPerformReindexingPass(theCount);
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSearchParameterDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSearchParameterDstu2.java
index 3c87592de45..658bb28ef74 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSearchParameterDstu2.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSearchParameterDstu2.java
@@ -46,8 +46,8 @@ public class FhirResourceDaoSearchParameterDstu2 extends FhirResourceDaoDstu2<Se
 			return;
 		}
 
-		int count = mySystemDao.performReindexingPass(100);
-		for (int i = 0; i < 50 && count != 0; i++) {
+		Integer count = mySystemDao.performReindexingPass(100);
+		for (int i = 0; i < 50 && count != null && count != 0; i++) {
 			count = mySystemDao.performReindexingPass(100);
 			try {
 				Thread.sleep(DateUtils.MILLIS_PER_SECOND);
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirSystemDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirSystemDao.java
index e4b4c262791..e3f873d2a2a 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirSystemDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirSystemDao.java
@@ -10,7 +10,7 @@ package ca.uhn.fhir.jpa.dao;
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -32,12 +32,16 @@ import ca.uhn.fhir.rest.server.IBundleProvider;
 /**
  * @param <T>
  *           The bundle type
+ * @param <MT>
+ *           The Meta datatype type
  */
 public interface IFhirSystemDao<T, MT> extends IDao {
 
 	/**
 	 * Use with caution! This deletes everything!!
-	 * @param theRequestDetails TODO
+	 * 
+	 * @param theRequestDetails
+	 *           TODO
 	 */
 	void deleteAllTagsOnServer(RequestDetails theRequestDetails);
 
@@ -58,11 +62,13 @@ public interface IFhirSystemDao<T, MT> extends IDao {
 
 	/**
 	 * Not supported for DSTU1
-	 * @param theRequestDetails TODO
+	 * 
+	 * @param theRequestDetails
+	 *           TODO
 	 */
 	MT metaGetOperation(RequestDetails theRequestDetails);
 
-	int performReindexingPass(Integer theCount);
+	Integer performReindexingPass(Integer theCount);
 
 	T transaction(RequestDetails theRequestDetails, T theResources);
 
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSearchParameterDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSearchParameterDstu3.java
index 5432daf5206..344fa4b83c1 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSearchParameterDstu3.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSearchParameterDstu3.java
@@ -73,8 +73,8 @@ public class FhirResourceDaoSearchParameterDstu3 extends FhirResourceDaoDstu3<Se
 			return;
 		}
 
-		int count = mySystemDao.performReindexingPass(100);
-		for (int i = 0; i < 50 && count != 0; i++) {
+		Integer count = mySystemDao.performReindexingPass(100);
+		for (int i = 0; i < 50 && count != null && count != 0; i++) {
 			count = mySystemDao.performReindexingPass(100);
 			try {
 				Thread.sleep(DateUtils.MILLIS_PER_SECOND);