diff --git a/output/fceux.chm b/output/fceux.chm
index bd906623..0342c03d 100644
Binary files a/output/fceux.chm and b/output/fceux.chm differ
diff --git a/src/drivers/win/ramwatch.cpp b/src/drivers/win/ramwatch.cpp
index fd294bf9..ca09dfee 100644
--- a/src/drivers/win/ramwatch.cpp
+++ b/src/drivers/win/ramwatch.cpp
@@ -980,6 +980,12 @@ INT_PTR CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 						// get the address(es)
 						char str_addrs[1024];
 						GetDlgItemText(hDlg, addrCtrlID, str_addrs, 1024);
+						if (!str_addrs[0])
+						{
+							MessageBox(hDlg, "You must enter an address.", "Error", MB_OK | MB_ICONERROR);
+							return true;
+						}
+						
 						char* next = strtok(str_addrs, ",");
 						int i = 0;
 						unsigned int addrSize = 4;
diff --git a/vc/Help/fceux.hnd b/vc/Help/fceux.hnd
index 948ac76e..2da5ec5c 100644
Binary files a/vc/Help/fceux.hnd and b/vc/Help/fceux.hnd differ