diff -r c0b74aa009f4 Doc/make.bat
--- a/Doc/make.bat	Fri Jun 06 09:14:33 2014 -0500
+++ b/Doc/make.bat	Sat Jun 07 17:14:29 2014 -0500
@@ -76,6 +76,14 @@
 cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%*
 
 if "%1" EQU "htmlhelp" (
+    if  not exist "%_PRGMFLS%\HTML Help Workshop\hhc.exe" (
+        echo.
+        echo.The HTML Help Workshop was not found.
+        echo.
+        echo.If you don't have HTML Help Workshop installed, get it free at
+        echo.http://msdn.microsoft.com/en-us/library/ms669985
+        goto end
+    )
     cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp
     rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2
     if not errorlevel 2 cmd /C exit /b 0