diff --git a/source/blender/python/api2_2x/Camera.c b/source/blender/python/api2_2x/Camera.c
index bd1e7932f5c..5558b179e23 100644
--- a/source/blender/python/api2_2x/Camera.c
+++ b/source/blender/python/api2_2x/Camera.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: Camera.c 12078 2007-09-18 06:41:29Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
@@ -478,7 +478,7 @@ static PyObject *Camera_oldsetLens( BPy_Camera * self, PyObject * value )
 {
 	float param = PyFloat_AsDouble(value);
 
-	if( !PyFloat_Check(value) )
+	if (PyErr_Occurred())
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "expected float argument" );
 
@@ -493,7 +493,7 @@ static PyObject *Camera_oldsetScale( BPy_Camera * self, PyObject * value )
 {
 	float param = PyFloat_AsDouble(value);
 
-	if( !PyFloat_Check(value) )
+	if (PyErr_Occurred())
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "expected float argument" );
 
@@ -508,7 +508,7 @@ static PyObject *Camera_oldsetClipStart( BPy_Camera * self, PyObject * value )
 {
 	float param = PyFloat_AsDouble(value);
 
-	if( !PyFloat_Check(value) )
+	if (PyErr_Occurred())
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "expected float argument" );
 
@@ -523,7 +523,7 @@ static PyObject *Camera_oldsetClipEnd( BPy_Camera * self, PyObject * value )
 {
 	float param = PyFloat_AsDouble(value);
 
-	if( !PyFloat_Check(value) )
+	if (PyErr_Occurred())
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "expected float argument" );
 
@@ -538,7 +538,7 @@ static PyObject *Camera_oldsetDrawSize( BPy_Camera * self, PyObject * value )
 {
 	float param = PyFloat_AsDouble(value);
 
-	if( !PyFloat_Check(value) )
+	if (PyErr_Occurred())
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "expected float argument" );
 
diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c
index ed5f1df4923..8263b92b0ac 100644
--- a/source/blender/src/drawimage.c
+++ b/source/blender/src/drawimage.c
@@ -1492,11 +1492,11 @@ static void image_panel_view_properties(short cntrl)	// IMAGE_HANDLER_VIEW_PROPE
 		uiBlockEndAlign(block);
 		uiDefButBitI(block, TOG, SI_SMOOTH_UV, B_REDR, "Smooth",	250,40,60,19,  &G.sima->flag, 0, 0, 0, 0, "Display smooth lines in the UV view");
 		
-		uiDefButBitI(block, TOG, SI_DRAW_STRETCH, B_REDR, "UV Stretch",	10,0,100,19,  &G.sima->flag, 0, 0, 0, 0, "Display distortion between the UV's and the 3D coords");
+		uiDefButBitI(block, TOG, SI_DRAW_STRETCH, B_REDR, "UV Stretch",	10,0,100,19,  &G.sima->flag, 0, 0, 0, 0, "Difference between UV's and the 3D coords (blue for low distortion, red is high)");
 		
 		uiBlockBeginAlign(block);
-		uiDefButC(block,  ROW, B_REDR, "Area",			126,0,58,19, &G.sima->dt_uvstretch, 0.0, SI_UVDT_STRETCH_AREA, 0, 0, "Draw the area distortion");
-		uiDefButC(block,  ROW, B_REDR, "Angle",		184,0,58,19, &G.sima->dt_uvstretch, 0.0, SI_UVDT_STRETCH_ANGLE, 0, 0, "Draw the angle distortion");
+		uiDefButC(block,  ROW, B_REDR, "Area",			120,0,60,19, &G.sima->dt_uvstretch, 0.0, SI_UVDT_STRETCH_AREA, 0, 0, "Area distortion between UV's and 3D coords");
+		uiDefButC(block,  ROW, B_REDR, "Angle",		180,0,60,19, &G.sima->dt_uvstretch, 0.0, SI_UVDT_STRETCH_ANGLE, 0, 0, "Angle distortion between UV's and 3D coords");
 		uiBlockEndAlign(block);
 		
 	}