diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c
index b7386791f49..2957dbfd1d5 100644
--- a/programs/winetest/gui.c
+++ b/programs/winetest/gui.c
@@ -337,6 +337,10 @@ AskTagProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
         switch (LOWORD (wParam)) {
         case IDOK:
             len = GetWindowTextLengthA (GetDlgItem (hwnd, IDC_TAG));
+	    if(!len) {
+               report (R_WARNING, "You must enter a tag to continue");
+               return FALSE;
+            }
             tag = xmalloc (len+1);
             GetDlgItemTextA (hwnd, IDC_TAG, tag, len+1);
             EndDialog (hwnd, IDOK);
diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index 045845a3552..86035f04379 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -672,7 +672,7 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst,
             SetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", "0" );
         }
 
-        if (!tag) {
+        while (!tag) {
             if (!interactive)
                 report (R_FATAL, "Please specify a tag (-t option) if "
                         "running noninteractive!");