diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/BaseReindexStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/BaseReindexStep.java
index 11480cdb207..95e5f5be163 100644
--- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/BaseReindexStep.java
+++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/BaseReindexStep.java
@@ -12,7 +12,7 @@ import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
 import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId;
 import ca.uhn.fhir.rest.api.server.storage.TransactionDetails;
 
-public class BaseReindexStep {
+public abstract class BaseReindexStep {
 
 	public static final int REINDEX_MAX_RETRIES = 10;
 
diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/CheckPendingReindexWorkStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/CheckPendingReindexWorkStep.java
index e86eca7d784..3b2505ace98 100644
--- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/CheckPendingReindexWorkStep.java
+++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/CheckPendingReindexWorkStep.java
@@ -30,8 +30,12 @@ public class CheckPendingReindexWorkStep implements IJobStepWorker<ReindexJobPar
 
 		if (!results.getResourceToHasWorkToComplete().isEmpty()) {
 			if (myReindexJobService.anyResourceHasPendingReindexWork(results.getResourceToHasWorkToComplete())) {
-				// give time for reindex work to complete
+				/* CHECKSTYLE.OFF: RegexpSingleLine
+				 * This exception is never fed to users and is only part of our structure
+				 * So there's no need to use an error code
+				 */
 				throw new RetryChunkLaterException(ReindexUtils.getRetryLaterDelay());
+				/* CHECKSTYLE.ON: RegexpSingleLine */
 			}
 		}
 
diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStepV2.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStepV2.java
index 1819f13e48a..097a6389601 100644
--- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStepV2.java
+++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStepV2.java
@@ -53,7 +53,12 @@ public class ReindexStepV2 extends BaseReindexStep
 			resourceTypesToCheckFlag.put(id.getResourceType(), true);
 		});
 		if (myReindexJobService.anyResourceHasPendingReindexWork(resourceTypesToCheckFlag)) {
+			/* CHECKSTYLE.OFF: RegexpSingleLine
+			 * This exception is never fed to users and is only part of our structure
+			 * So there's no need to use an error code
+			 */
 			throw new RetryChunkLaterException(ReindexUtils.getRetryLaterDelay());
+			/* CHECKSTYLE.ON: RegexpSingleLine */
 		}
 
 		ReindexResults results = doReindex(