diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java
index b982fb093a8..b2999af3bde 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java
@@ -227,10 +227,14 @@ public class PersistedJpaBundleProvider implements IBundleProvider {
 		template.execute(new TransactionCallbackWithoutResult() {
 			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus theStatus) {
-				ensureSearchEntityLoaded();
+				boolean entityLoaded = ensureSearchEntityLoaded();
+				assert entityLoaded;
 			}
 		});
 
+		assert mySearchEntity != null;
+		assert mySearchEntity.getSearchType() != null;
+
 		switch (mySearchEntity.getSearchType()) {
 			case HISTORY:
 				return template.execute(theStatus -> doHistoryInTransaction(theFromIndex, theToIndex));