diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10292e25f..6408bc455 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- core: avoid crash with corrupted cloud storage
 - planner: make ESC (cancel plan) work when moving handles
 - dive list: make dive guide visible in dive list [#3382]
 - general: rename dive master to dive guide
diff --git a/core/divesite.c b/core/divesite.c
index 654ca45dd..89c894951 100644
--- a/core/divesite.c
+++ b/core/divesite.c
@@ -371,6 +371,14 @@ void purge_empty_dive_sites(struct dive_site_table *ds_table)
 void add_dive_to_dive_site(struct dive *d, struct dive_site *ds)
 {
 	int idx;
+	if (!d) {
+		fprintf(stderr, "Warning: add_dive_to_dive_site called with NULL dive\n");
+		return;
+	}
+	if (!ds) {
+		fprintf(stderr, "Warning: add_dive_to_dive_site called with NULL dive site\n");
+		return;
+	}
 	if (d->dive_site == ds)
 		return;
 	if (d->dive_site) {