diff --git a/matlab/utilities/dataset/makedataset.m b/matlab/utilities/dataset/makedataset.m
index 5b0f2a210..17a801d0a 100644
--- a/matlab/utilities/dataset/makedataset.m
+++ b/matlab/utilities/dataset/makedataset.m
@@ -118,13 +118,13 @@ end
 
 % Load the data in a dseries object.
 if ~isempty(datafile)
-    if ~( newdatainterface==0 && (strcmp(datafile(end-1:end),'.m')|| strcmp(datafile(end-3:end),'.mat')))
+    if ~(newdatainterface==0 && ((length(datafile)>2 && strcmp(datafile(end-1:end),'.m')) || (length(datafile)>4 && strcmp(datafile(end-3:end),'.mat'))))
         DynareDataset = dseries(datafile);
     else
-        if strcmp(datafile(end-1:end),'.m')
+        if length(datafile)>2 && strcmp(datafile(end-1:end),'.m')
             % Load an m file with the old interface.
             DynareDataset = load_m_file_data_legacy(datafile, DynareOptions.varobs);
-        elseif strcmp(datafile(end-3:end),'.mat')
+        elseif length(datafile)>4 && strcmp(datafile(end-3:end),'.mat')
             % Load a mat file with the old interface.
             DynareDataset = load_mat_file_data_legacy(datafile, DynareOptions.varobs);
         end