Swallow known error that happens in add_person_data (#268)

* Swallow known error that happens in add_person_data

* clean up commented out other approach

rollbar/__init__.py

@@ -667,6 +667,7 @@ def _report_exc_info(exc_info, request, extra_data, payload_data, level=None):
     if extra_trace_data and not extra_data:
         data['custom'] = extra_trace_data
 
+    request = _get_actual_request(request)
     _add_request_data(data, request)
     _add_person_data(data, request)
     _add_lambda_context_data(data)
@@ -741,6 +742,7 @@ def _report_message(message, level, request, extra_data, payload_data):
         extra_data = extra_data
         data['body']['message'].update(extra_data)
 
+    request = _get_actual_request(request)
     _add_request_data(data, request)
     _add_person_data(data, request)
     _add_lambda_context_data(data)
@@ -1020,6 +1022,15 @@ def _check_add_locals(frame, frame_num, total_frames):
                 ('root' in SETTINGS and (frame.get('filename') or '').lower().startswith((SETTINGS['root'] or '').lower()))))
 
 
+def _get_actual_request(request):
+    if WerkzeugLocalProxy and isinstance(request, WerkzeugLocalProxy):
+        try:
+            actual_request = request._get_current_object()
+        except RuntimeError:
+            return None
+        return actual_request
+    return request
+
 def _build_request_data(request):
     """
     Returns a dictionary containing data from the request.
@@ -1042,13 +1053,6 @@ def _build_request_data(request):
     if WerkzeugRequest and isinstance(request, WerkzeugRequest):
         return _build_werkzeug_request_data(request)
 
-    if WerkzeugLocalProxy and isinstance(request, WerkzeugLocalProxy):
-        try:
-            actual_request = request._get_current_object()
-        except RuntimeError:
-            return None
-        return _build_werkzeug_request_data(actual_request)
-
     # tornado
     if TornadoRequest and isinstance(request, TornadoRequest):
         return _build_tornado_request_data(request)