diff --git a/src/app/panels/graphite/editor.html b/src/app/panels/graphite/editor.html
index fbcf0e24cbe..ed1a7467bdb 100644
--- a/src/app/panels/graphite/editor.html
+++ b/src/app/panels/graphite/editor.html
@@ -29,14 +29,14 @@
           </li>
         </ul>
 
-<!--         <input  type="text"
+        <input  type="text"
                 class="grafana-target-text-input"
                 ng-model="target.target"
                 focus-me="showTextEditor"
                 ng-blur="showTextEditor = false"
                 ng-model-onblur ng-change="targetChanged()"
                 ng-show="showTextEditor" />
- -->
+
         <ul class="grafana-segment-list" role="menu" ng-hide="showTextEditor">
           <li class="dropdown" ng-repeat="segment in segments" role="menuitem">
             <a  tabindex="1"
diff --git a/src/app/panels/graphite/module.js b/src/app/panels/graphite/module.js
index 7c03e774ff2..58479a7b043 100644
--- a/src/app/panels/graphite/module.js
+++ b/src/app/panels/graphite/module.js
@@ -322,12 +322,14 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv, RQ) {
       ]);
 
       result(function (data, failure) {
-        if (failure) {
+        $scope.panelMeta.loading = false;
+
+        if (failure || !data) {
           $scope.panel.error = 'Failed to do fetch graphite data: ' + failure;
+          $scope.$apply();
           return;
         }
 
-        $scope.panelMeta.loading = false;
         $scope.$apply();
 
         // Tell the histogram directive to render.