3 files changed, 5 insertions, 14 deletions
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp
index 8305aed37b..5c6c3cb474 100644
--- a/engines/sci/sfx/iterator.cpp
+++ b/engines/sci/sfx/iterator.cpp
@@ -1939,10 +1939,7 @@ void song_iterator_add_death_listener(song_iterator_t *it,
                                  void *client,
                                  void (*notify)(void *self, void *notifier)) {
 	if (it->death_listeners_nr >= SONGIT_MAX_LISTENERS) {
-		fprintf(stderr, "FATAL: Too many death listeners for song"
-		        " iterator\n");
-		BREAKPOINT();
-		exit(1);
+		error("FATAL: Too many death listeners for song iterator");
 	}
 
 	it->death_listeners[it->death_listeners_nr].notify = notify;
@@ -1967,10 +1964,7 @@ void song_iterator_remove_death_listener(song_iterator_t *it,
 		}
 	}
 
-	fprintf(stderr, "FATAL: Could not remove death listener from "
-	        "song iterator\n");
-	BREAKPOINT();
-	exit(1);
+	error("FATAL: Could not remove death listener from song iterator\n");
 }
 
 
diff --git a/engines/sci/sfx/mixer/soft.cpp b/engines/sci/sfx/mixer/soft.cpp
index 6e70be6eea..09d3f79ee1 100644
--- a/engines/sci/sfx/mixer/soft.cpp
+++ b/engines/sci/sfx/mixer/soft.cpp
@@ -606,9 +606,8 @@ static void mix_compute_input_linear(sfx_pcm_mixer_t *self, int add_result,
 			return;
 
 		default:
-			fprintf(stderr, "[soft-mixer] Fatal: Invalid mode returned by PCM feed %s-%d's get_timestamp(): %d\n",
+			error("[soft-mixer] Fatal: Invalid mode returned by PCM feed %s-%d's get_timestamp(): %d\n",
 			        f->debug_name, f->debug_nr, newmode);
-			exit(1);
 		}
 	}
 
diff --git a/engines/sci/sfx/softseq/opl2.cpp b/engines/sci/sfx/softseq/opl2.cpp
index 627659abd4..2986917b7a 100644
--- a/engines/sci/sfx/softseq/opl2.cpp
+++ b/engines/sci/sfx/softseq/opl2.cpp
@@ -473,13 +473,11 @@ static void opl2_poll(sfx_softseq_t *self, byte *dest, int count) {
 	gint16 *ptr = buffer;
 
 	if (!ready) {
-		fprintf(stderr, "synth_mixer(): !ready \n");
-		exit(1);
+		error("synth_mixer(): !ready \n");
 	}
 
 	if (!buffer) {
-		fprintf(stderr, "synth_mixer(): !buffer \n");
-		exit(1);
+		error("synth_mixer(): !buffer \n");
 	}
 
 #if 0