diff --git a/matlab/cherrypick.m b/matlab/cherrypick.m
index 075ee7f27890ffaf34606a6f16458bfa4452cf4d..055cd29489eba04b3fd6a6e3c4b9195f540d8329 100644
--- a/matlab/cherrypick.m
+++ b/matlab/cherrypick.m
@@ -315,7 +315,11 @@ if ~isempty(plist)
     for i=1:length(plist)
         id = strcmp(plist{i}, M_.param_names);
         if any(id)
-            fprintf(fid, '%s = %s;\n', plist{i}, num2str(M_.params(id), 16));
+            if isnan(M_.params(id))
+                warning('Parameter %s has no value.', plist{i})
+            else
+                fprintf(fid, '%s = %s;\n', plist{i}, num2str(M_.params(id), 16));
+            end
         end
     end
     fclose(fid);