diff --git a/Lib/python/pyptrtypes.swg b/Lib/python/pyptrtypes.swg
index 0faa58a93..f56391b3b 100644
--- a/Lib/python/pyptrtypes.swg
+++ b/Lib/python/pyptrtypes.swg
@@ -27,7 +27,7 @@
     __VA_ARGS__ *ptr = (__VA_ARGS__ *)0;
     int res = asptr_meth($input, &ptr);
     if (!res || !ptr) {
-      PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
+      PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
       return 1;
     }
     $1 = *ptr;
diff --git a/Lib/python/pystrbase.swg b/Lib/python/pystrbase.swg
index 6a7faaf5d..71a2cb9da 100644
--- a/Lib/python/pystrbase.swg
+++ b/Lib/python/pystrbase.swg
@@ -55,7 +55,7 @@
   Char *cptr = 0;
   if (!SWIG_AsNewCharPtr($input, &cptr)) {
     PyErr_Clear();
-    PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
+    PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
     return 1;
   }
   if ($1) swig_delete_array($1);
@@ -69,7 +69,7 @@
   Char *cptr;
   if (!SWIG_AsNewCharPtr($input, &cptr)) {    
     PyErr_Clear();
-    PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
+    PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
     return 1;
   }
   $1 = cptr;
@@ -139,14 +139,11 @@
 %apply Char* { Char [] };
 %apply const Char* { const Char [] };
 
-%typemap(varin,fragment=#SWIG_AsCharArray) Char []
+%typemap(varin,fragment=#SWIG_AsCharArray,
+	 warning="462:Unable to set variable of type Char []") Char []
 {
-  size_t size = sizeof($1);
-  if (!SWIG_AsCharArray($input, $1, size)) {
-    PyErr_Clear();
-    PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
-    return 1;
-  }
+  PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name' is read-only");
+  return 1;
 }
 
 
@@ -189,7 +186,7 @@
 {
   if (!SWIG_AsCharArray($input, $1, $1_dim0)) {
     PyErr_Clear();
-    PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
+    PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
     return 1;
   }
 }
diff --git a/Lib/python/pyswigtype.swg b/Lib/python/pyswigtype.swg
index 68831affc..45a4a5d06 100644
--- a/Lib/python/pyswigtype.swg
+++ b/Lib/python/pyswigtype.swg
@@ -85,7 +85,7 @@
   int ii;
   $1_basetype *b = 0;
   if ((SWIG_ConvertPtr($input, &temp, $1_descriptor, SWIG_POINTER_EXCEPTION)) == -1) {
-    PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
+    PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
     return 1;
   }
   b = ($1_basetype *) $1;
@@ -95,7 +95,7 @@
 %typemap(varin) SWIGTYPE * {
   void *temp;
   if ((SWIG_ConvertPtr($input, &temp, $1_descriptor, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) {
-    PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
+    PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
     return 1;
   }
   $1 = ($1_ltype) temp;
@@ -104,7 +104,7 @@
 %typemap(varin) SWIGTYPE & {
   void *temp;
   if ((SWIG_ConvertPtr($input, &temp, $1_descriptor, SWIG_POINTER_EXCEPTION)) == -1 || temp == NULL) {
-    PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
+    PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
     return 1;
   }
   $1 = *($1_ltype) temp;
@@ -114,7 +114,7 @@
 %typemap(varin) SWIGTYPE (CLASS::*) {
   char temp[sizeof($1_type)];
   if ((SWIG_ConvertPacked($input,(void *) temp, sizeof($1_type), $1_descriptor, SWIG_POINTER_EXCEPTION)) == -1) {
-    PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
+    PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
     return 1;
   }
   memmove((void *) &$1,temp,sizeof($1_type));
@@ -123,7 +123,7 @@
 %typemap(varin) SWIGTYPE {
   $&1_ltype temp;
   if ((SWIG_ConvertPtr($input, (void **)(&temp), $&1_descriptor, SWIG_POINTER_EXCEPTION)) == -1) {
-    PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
+    PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
     return 1;
   }
   $1 = *(($&1_type) temp);
diff --git a/Lib/python/pyvaltypes.swg b/Lib/python/pyvaltypes.swg
index 69d7f0a57..94d999daa 100644
--- a/Lib/python/pyvaltypes.swg
+++ b/Lib/python/pyvaltypes.swg
@@ -31,7 +31,7 @@
   %typemap(varin,fragment=pyfrag) __VA_ARGS__ {
     $1_type temp = ($1_type) as_meth($input);  
     if (PyErr_Occurred()) {
-      PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
+      PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
       return 1;
     }
     $1 = temp;
diff --git a/Lib/python/pyvoid.swg b/Lib/python/pyvoid.swg
index a7eec4350..6d28eda8c 100644
--- a/Lib/python/pyvoid.swg
+++ b/Lib/python/pyvoid.swg
@@ -18,7 +18,7 @@
   void * temp;
   if ((SWIG_ConvertPtr($input, &temp, 0,
 		       SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) {
-    PyErr_SetString(PyExc_TypeError, "C variable '$name ($1_ltype)'");
+    PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
     return 1;
   }
   $1 = ($1_ltype) temp;