diff --git a/src/cell.c b/src/cell.c
index 33fad78ccc6ed3e1ab10beff81afb95a96d8e7ff..1b62d81b99f8b388bebcc02e238466a65ffecf6b 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -3774,13 +3774,12 @@ struct spart *cell_add_spart(struct engine *e, struct cell *const c) {
 
     /* Update the gpart->spart links (shift by 1) */
     for (int i = 0; i < n_copy; ++i) {
-      if (c->stars.parts[i + 1].gpart != NULL) {
-        c->stars.parts[i + 1].gpart->id_or_neg_offset--;
-      } else {
 #ifdef SWIFT_DEBUG_CHECKS
+      if (c->stars.parts[i + 1].gpart == NULL) {
         error("Incorrectly linked spart!");
-#endif
       }
+#endif
+      c->stars.parts[i + 1].gpart->id_or_neg_offset--;
     }
   }
 
diff --git a/src/runner.c b/src/runner.c
index 6edb69d06e7af41e3081a6adc2e6d90a2f49b5d4..ab74d8e19ca045293d56ac355d3f6e8b737b476a 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -529,8 +529,8 @@ void runner_do_star_formation(struct runner *r, struct cell *c, int timer) {
           /* Create a fresh (empty) spart */
           struct spart *sp = cell_add_spart(e, c);
 
-	  /* Did we run out of free spart slots? */
-	  if (sp == NULL) continue;
+          /* Did we run out of free spart slots? */
+          if (sp == NULL) continue;
 
           /* Destroy the gas particle and get it's gpart friend */
           struct gpart *gp = cell_convert_part_to_gpart(e, c, p, xp);