diff --git a/paddle/api/Matrix.cpp b/paddle/api/Matrix.cpp
index 6201ce926f2899664e438c05fdcf31d22745762a..0c8d2935a0d6c392c5a7bd6b6af9a8ceaf74f6f7 100644
--- a/paddle/api/Matrix.cpp
+++ b/paddle/api/Matrix.cpp
@@ -53,13 +53,11 @@ Matrix* Matrix::createDense(const std::vector<float>& data, size_t height,
 }
 
 Matrix* Matrix::createDenseFromNumpy(float* data, int dim1, int dim2,
-                                      bool copy, bool useGpu)
-                                      throw (UnsupportError) {
+                                      bool copy, bool useGpu) {
   if (useGpu) {
     /// Gpu mode only supports copy=True
     if (!copy) {
-      UnsupportError e;
-      throw e;
+      throw UnsupportError("Gpu mode only supports copy=True");
     }
     return Matrix::createGpuDenseFromNumpy(data, dim1, dim2);
   } else {
diff --git a/paddle/api/Paddle.swig b/paddle/api/Paddle.swig
index eaee182b52e67ff5a942bde26ea9e102355b4ad3..e723a669f375c52e76b734268a04ae8a49209d83 100644
--- a/paddle/api/Paddle.swig
+++ b/paddle/api/Paddle.swig
@@ -4,6 +4,20 @@
 #define SWIG_FILE_WITH_INIT
 #include "api/PaddleAPI.h"   
 %}
+
+%include "exception.i"
+%exception{
+    try{
+        $action
+    }
+    catch(UnsupportError &ex ){
+        SWIG_exception(SWIG_RuntimeError, ex.what());
+    }
+    catch( ... ){
+        SWIG_fail;
+    }
+}
+
 %include "std_vector.i"
 %include "std_pair.i"
 #ifdef SWIGPYTHON
diff --git a/paddle/api/PaddleAPI.h b/paddle/api/PaddleAPI.h
index 5df732013607e147d11f584f634064d406bd46f4..807519e739c9b0be9cd7130287d052373b55b923 100644
--- a/paddle/api/PaddleAPI.h
+++ b/paddle/api/PaddleAPI.h
@@ -18,6 +18,7 @@ limitations under the License. */
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
+#include <stdexcept>
 #include <vector>
 #include "paddle/utils/GlobalConstants.h"
 #include "paddle/utils/TypeDefs.h"
@@ -45,6 +46,9 @@ void initPaddle(int argc, char** argv);
 /// Return FLAGS_use_gpu
 bool isUsingGpu();
 
+/// Set the Flags_use_gpu to the given parameter
+void setUseGpu(bool useGpu);
+
 /// Return true if this py_paddle is compiled in GPU Version
 bool isGpuVersion();
 
@@ -55,7 +59,11 @@ class IOError {};
 class RangeError {};
 
 /// Not support Error, such as access GPU memory directly, etc.
-class UnsupportError {};
+class UnsupportError : public std::runtime_error {
+public:
+  UnsupportError() : std::runtime_error(" ") {};
+  UnsupportError(const std::string& message) : std::runtime_error(message) {};
+};
 
 /// This type will map to python's list of float.
 struct FloatArray {
@@ -131,8 +139,7 @@ public:
 
   static Matrix* createDenseFromNumpy(float* data, int dim1, int dim2,
                                       bool copy = true,
-                                      bool useGpu = isUsingGpu())
-                                      throw (UnsupportError) ;
+                                      bool useGpu = isUsingGpu());
 
   /**
    *  Create Cpu Dense Matrix from numpy matrix, dtype=float32
@@ -241,8 +248,7 @@ public:
                         bool useGpu = isUsingGpu());
 
   static Vector* createVectorFromNumpy(float* data, int dim, bool copy = true,
-                                       bool useGpu = isUsingGpu())
-                                       throw (UnsupportError) ;
+                                       bool useGpu = isUsingGpu());
   /**
    * Create Cpu Vector from numpy array, which dtype=float32
    *
@@ -305,8 +311,7 @@ public:
                          bool useGpu = isUsingGpu());
 
   static IVector* createVectorFromNumpy(int* data, int dim, bool copy = true,
-                                        bool useGpu = isUsingGpu())
-                                        throw (UnsupportError) ;
+                                        bool useGpu = isUsingGpu());
 
   /**
    * Create Cpu IVector from numpy array, which dtype=int32
diff --git a/paddle/api/Util.cpp b/paddle/api/Util.cpp
index f72c06aad31ca4b9319a63556a0fead179e1dbbe..a8932351a685474a756c3f5b0e5e8c42bbf58237 100644
--- a/paddle/api/Util.cpp
+++ b/paddle/api/Util.cpp
@@ -43,6 +43,8 @@ IntWithFloatArray::IntWithFloatArray(const float* v, const int* i, size_t l,
 
 bool isUsingGpu() {return FLAGS_use_gpu;}
 
+void setUseGpu(bool useGpu) {FLAGS_use_gpu = useGpu;}
+
 bool isGpuVersion() {
 #ifdef PADDLE_ONLY_CPU
   return false;
diff --git a/paddle/api/Vector.cpp b/paddle/api/Vector.cpp
index b8b1b2d2f1977b7f38c37d355ac9036034b95392..547be27ed560ff64d489cc168493ddb655fa76b4 100644
--- a/paddle/api/Vector.cpp
+++ b/paddle/api/Vector.cpp
@@ -40,13 +40,11 @@ IVector* IVector::create(const std::vector<int>& data, bool useGpu) {
 }
 
 IVector* IVector::createVectorFromNumpy(int* data, int dim, bool copy,
-                                        bool useGpu)
-                                        throw (UnsupportError) {
+                                        bool useGpu) {
   if (useGpu) {
     /// if use gpu only copy=true is supported
     if (!copy) {
-      UnsupportError e;
-      throw e;
+      throw UnsupportError("Gpu mode only supports copy=True");
     }
     return IVector::createGpuVectorFromNumpy(data, dim);
   } else {
@@ -204,13 +202,11 @@ Vector* Vector::createByPaddleVectorPtr(void* ptr) {
 }
 
 Vector* Vector::createVectorFromNumpy(float* data, int dim, bool copy,
-                                      bool useGpu)
-                                      throw (UnsupportError) {
+                                      bool useGpu) {
   if (useGpu) {
     /// if use gpu only copy=True is supported
     if (!copy) {
-      UnsupportError e;
-      throw e;
+      throw UnsupportError("Gpu mode only supports copy=True");
     }
     return Vector::createGpuVectorFromNumpy(data, dim);
   } else {
diff --git a/paddle/api/test/testMatrix.py b/paddle/api/test/testMatrix.py
index 6d0d42f340e0bdfa76a38ad137a7a9b5e3e89e3f..87cedd607c4651942cb9f2c29dff798318da5913 100644
--- a/paddle/api/test/testMatrix.py
+++ b/paddle/api/test/testMatrix.py
@@ -111,5 +111,9 @@ class TestMatrix(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    swig_paddle.initPaddle("--use_gpu=1" if swig_paddle.isGpuVersion() else "--use_gpu=0")
-    unittest.main()
+    swig_paddle.initPaddle("--use_gpu=0")
+    suite = unittest.TestLoader().loadTestsFromTestCase(TestMatrix)
+    unittest.TextTestRunner().run(suite)
+    if swig_paddle.isGpuVersion():
+        swig_paddle.setUseGpu(True)
+        unittest.main()
diff --git a/paddle/api/test/testVector.py b/paddle/api/test/testVector.py
index 5ca4d90dee7695dc11596efd5ee0c9b1ace14cfc..48aaa1d73da9e6c207ad5fa2be14a531267bd901 100644
--- a/paddle/api/test/testVector.py
+++ b/paddle/api/test/testVector.py
@@ -147,7 +147,9 @@ class TestVector(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    swig_paddle.initPaddle("--use_gpu=1"
-                           if swig_paddle.isGpuVersion() else "--use_gpu=0")
-    unittest.main()
-    
+    swig_paddle.initPaddle("--use_gpu=0")
+    suite = unittest.TestLoader().loadTestsFromTestCase(TestVector)
+    unittest.TextTestRunner().run(suite)
+    if swig_paddle.isGpuVersion():
+        swig_paddle.setUseGpu(True)
+        unittest.main()
\ No newline at end of file