diff --git a/file.c b/file.c
index f0761b15ef..85e66a781d 100755
--- a/file.c
+++ b/file.c
@@ -995,6 +995,14 @@ char ast_waitstream_fr(struct ast_channel *c, const char *breakon, const char *f
 {
 	int res;
 	struct ast_frame *fr;
+
+	if (!breakon)
+			breakon = "";
+	if (!forward)
+			forward = "";
+	if (!rewind)
+			rewind = "";
+	
 	while(c->stream) {
 		res = ast_sched_wait(c->sched);
 		if ((res < 0) && !c->timingfunc) {
@@ -1059,6 +1067,9 @@ char ast_waitstream_full(struct ast_channel *c, const char *breakon, int audiofd
 	int outfd;
 	struct ast_frame *fr;
 	struct ast_channel *rchan;
+
+	if (!breakon)
+		breakon = "";
 	
 	while(c->stream) {
 		ms = ast_sched_wait(c->sched);