diff --git a/waflib/Tools/ifort.py b/waflib/Tools/ifort.py
index 5ba88527..f7c1fd31 100644
--- a/waflib/Tools/ifort.py
+++ b/waflib/Tools/ifort.py
@@ -85,7 +85,7 @@ def configure(conf):
 		v.MSVC_COMPILER = compiler
 		try:
 			v.MSVC_VERSION = float(version)
-		except TypeError:
+		except ValueError:
 			v.MSVC_VERSION = float(version[:-3])
 
 		conf.find_ifort_win32()
diff --git a/waflib/Tools/msvc.py b/waflib/Tools/msvc.py
index 341ab3a0..54accc5c 100644
--- a/waflib/Tools/msvc.py
+++ b/waflib/Tools/msvc.py
@@ -806,7 +806,7 @@ def autodetect(conf, arch=False):
 	v.MSVC_COMPILER = compiler
 	try:
 		v.MSVC_VERSION = float(version)
-	except TypeError:
+	except ValueError:
 		v.MSVC_VERSION = float(version[:-3])
 
 def _get_prog_names(conf, compiler):