1 files changed, 2 insertions, 1 deletions
diff --git a/info.c b/info.c
index 2916c0eaf..5e47a2590 100644
--- a/info.c
+++ b/info.c
@@ -906,7 +906,8 @@ int edit_multi_dive_info(struct dive *single_dive)
 	master = single_dive;
 	if (!master)
 		master = current_dive;
-
+	if (!master)
+		return 0;
 	/* See if we should use multi dive mode */
 	multi = FALSE;
 	if (!single_dive) {