diff --git a/plugins/google_analytics_reports_plugin_argument_default_google_analytics_reports_path.inc b/plugins/google_analytics_reports_plugin_argument_default_google_analytics_reports_path.inc
index 7635a54..485428d 100644
--- a/plugins/google_analytics_reports_plugin_argument_default_google_analytics_reports_path.inc
+++ b/plugins/google_analytics_reports_plugin_argument_default_google_analytics_reports_path.inc
@@ -17,6 +17,6 @@ class google_analytics_reports_plugin_argument_default_google_analytics_reports_
    */
   public function get_argument() {
     // Decode urls, that might appear due to browsers particularities.
-    return check_plain(urldecode(request_uri()));
+    return urldecode(request_uri());
   }
 }
diff --git a/plugins/google_analytics_reports_plugin_query_google_analytics.inc b/plugins/google_analytics_reports_plugin_query_google_analytics.inc
index c1ae29c..bbda863 100644
--- a/plugins/google_analytics_reports_plugin_query_google_analytics.inc
+++ b/plugins/google_analytics_reports_plugin_query_google_analytics.inc
@@ -285,7 +285,7 @@ class google_analytics_reports_plugin_query_google_analytics extends views_plugi
       // Display the error from Google.
       $response_data = drupal_json_decode($count_feed->response->data);
       if (isset($response_data['error']['message'])) {
-        drupal_set_message($response_data['error']['message'], 'error');
+        drupal_set_message(check_plain($response_data['error']['message']), 'error');
       }
     }