diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 7c125a4a02..48289702cd 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -23,10 +23,10 @@ MFLAGS=-l
 # executable in $(tooldir).
 ! if [cd $(tooldir) && ruby missing-baseruby.bat 2> nul]
 ! else if [(cd $(tooldir) && for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I) > baseruby.mk]
-! else
+! else if exist(baseruby.mk)
 !   include baseruby.mk
 ! endif
-! if [del baseruby.mk]
+! if [del baseruby.mk 2> nul]
 ! endif
 !else if "$(BASERUBY)" == "no" || [($(BASERUBY) -eexit) > nul 2> nul]
 BASERUBY =