diff --git a/src/cell.h b/src/cell.h
index f1b1a96d8dcb785b90a2e16cfe7933fd3ce01738..2b168835d36a2ca346060f4758e802d84a711213 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -1003,7 +1003,8 @@ cell_need_rebuild_for_hydro_pair(const struct cell *ci, const struct cell *cj) {
           cj->dmin);
 }
 /**
- * @brief Have particles in a pair of cells moved too much and require a rebuild
+ * @brief Have star particles in a pair of cells moved too much and require a
+ * rebuild
  * ?
  *
  * @param ci The first #cell.
diff --git a/src/error.h b/src/error.h
index 181a32c78b4ef09708eeade002157157895ddde5..d384ec56ba0dc3562160d94911e3e3d3bb786211 100644
--- a/src/error.h
+++ b/src/error.h
@@ -54,7 +54,7 @@ extern int engine_rank;
     fprintf(stderr, "[%04i] %s %s:%s():%i: " s "\n", engine_rank,          \
             clocks_get_timesincestart(), __FILE__, __FUNCTION__, __LINE__, \
             ##__VA_ARGS__);                                                \
-    swift_abort(1);                                                        \
+    MPI_Abort(MPI_COMM_WORLD, -1);                                         \
   })
 #else
 #define error(s, ...)                                                      \
diff --git a/src/scheduler.h b/src/scheduler.h
index 3ee92b2bdd114e23c8a5368506ef0ebba7d889f3..2d2a4378daf7ebc20229c7bdbd256ba65413bb7f 100644
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -140,7 +140,6 @@ __attribute__((always_inline)) INLINE static void scheduler_activate(
 __attribute__((always_inline)) INLINE static struct link *
 scheduler_activate_send(struct scheduler *s, struct link *link, int nodeID) {
 
-  if (link == NULL) error("");
   struct link *l = NULL;
   for (l = link; l != NULL && l->t->cj->nodeID != nodeID; l = l->next)
     ;