diff --git a/flask/app.py b/flask/app.py
index c0a9dac3ad..97dc5bde48 100644
--- a/flask/app.py
+++ b/flask/app.py
@@ -1490,7 +1490,11 @@ def handle_build_error(self, error, endpoint, **values):
         Calls :attr:`build_error_handler` if it is not `None`.
         """
         if self.build_error_handler is None:
-            raise error
+            exc_type, exc_value, tb = sys.exc_info()
+            if exc_value is error:
+                raise exc_type, exc_value, tb
+            else:
+                raise error
         return self.build_error_handler(error, endpoint, **values)
 
     def preprocess_request(self):
diff --git a/flask/testsuite/basic.py b/flask/testsuite/basic.py
index d138c45e20..cf7590cbfe 100644
--- a/flask/testsuite/basic.py
+++ b/flask/testsuite/basic.py
@@ -698,8 +698,23 @@ def hello():
 
     def test_build_error_handler(self):
         app = flask.Flask(__name__)
+
+        # Test base case, a URL which results in a BuildError.
         with app.test_request_context():
             self.assertRaises(BuildError, flask.url_for, 'spam')
+
+        # Verify the error is re-raised if not the current exception.
+        try:
+            with app.test_request_context():
+                flask.url_for('spam')
+        except BuildError, error:
+            pass
+        try:
+            raise RuntimeError('Test case where BuildError is not current.')
+        except RuntimeError:
+            self.assertRaises(BuildError, app.handle_build_error, error, 'spam')
+
+        # Test a custom handler.
         def handler(error, endpoint, **values):
             # Just a test.
             return '/test_handler/'