diff --git a/src/drivers/sdl/ramwatch.cpp b/src/drivers/sdl/ramwatch.cpp
index 4fde04c7..04797d24 100644
--- a/src/drivers/sdl/ramwatch.cpp
+++ b/src/drivers/sdl/ramwatch.cpp
@@ -934,6 +934,11 @@ static void ramWatch_cell_edited_cb (GtkCellRendererText * cell,
 
 	rw = ramWatchList.getIndex (rww->ramWatchEditRowIdx);
 
+	if ( rw == NULL )
+	{
+		return;
+	}
+
 	switch (rww->ramWatchEditColIdx)
 	{
 		case 0: