diff --git a/gst/elements/gstdisksink.c b/gst/elements/gstdisksink.c
index 93efdf3d44..764bce5db3 100644
--- a/gst/elements/gstdisksink.c
+++ b/gst/elements/gstdisksink.c
@@ -145,7 +145,7 @@ gst_disksink_getcurrentfilename (GstDiskSink *disksink)
 {
   g_return_val_if_fail(disksink != NULL, NULL);
   g_return_val_if_fail(GST_IS_DISKSINK(disksink), NULL);
-  g_return_val_if_fail(disksink->filename != NULL, NULL);
+  if (disksink->filename == NULL) return NULL;
   g_return_val_if_fail(disksink->filenum >= 0, NULL);
 
   if (!strstr(disksink->filename, "%"))
diff --git a/plugins/elements/gstdisksink.c b/plugins/elements/gstdisksink.c
index 93efdf3d44..764bce5db3 100644
--- a/plugins/elements/gstdisksink.c
+++ b/plugins/elements/gstdisksink.c
@@ -145,7 +145,7 @@ gst_disksink_getcurrentfilename (GstDiskSink *disksink)
 {
   g_return_val_if_fail(disksink != NULL, NULL);
   g_return_val_if_fail(GST_IS_DISKSINK(disksink), NULL);
-  g_return_val_if_fail(disksink->filename != NULL, NULL);
+  if (disksink->filename == NULL) return NULL;
   g_return_val_if_fail(disksink->filenum >= 0, NULL);
 
   if (!strstr(disksink->filename, "%"))