diff --git a/html/includes/graphs/graph.inc.php b/html/includes/graphs/graph.inc.php
index 94e4e739f6..f8a0bc949f 100644
--- a/html/includes/graphs/graph.inc.php
+++ b/html/includes/graphs/graph.inc.php
@@ -91,14 +91,19 @@ function graph_error($string)
   exit();
 }
 
-if (!$auth)
-{
+if ($error_msg) {
+
+  graph_error($graph_error);
+
+} elseif (!$auth) {
+ 
   if ($width < 200)
   {
    graph_error("No Auth");
   } else {
    graph_error("No Authorisation");
   }
+
 } else {
   #$rrd_options .= " HRULE:0#999999";
   if ($no_file)
diff --git a/html/includes/graphs/macaccounting/auth.inc.php b/html/includes/graphs/macaccounting/auth.inc.php
index 111a08b924..c81134a7a8 100644
--- a/html/includes/graphs/macaccounting/auth.inc.php
+++ b/html/includes/graphs/macaccounting/auth.inc.php
@@ -6,16 +6,20 @@ if (is_numeric($id))
   $acc = dbFetchRow("SELECT * FROM `mac_accounting` AS M, `ports` AS I, `devices` AS D WHERE M.ma_id = ? AND I.interface_id = M.interface_id AND I.device_id = D.device_id", array($id));
 
   if (($config['allow_unauth_graphs'] || port_permitted($acc['interface_id']))
-       && is_file($config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd")))
   {
-    $rrd_filename = $config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd");  
+    if(is_file($config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd")))
+      {
+      $rrd_filename = $config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd");  
 
-    $port   = get_port_by_id($acc['interface_id']);
-    $device = device_by_id_cache($port['device_id']);
-    $title  = generate_device_link($device);
-    $title .= " :: Port  ".generate_port_link($port);
-    $title .= " :: " . formatMac($acc['mac']);
-    $auth   = TRUE;
+      $port   = get_port_by_id($acc['interface_id']);  
+      $device = device_by_id_cache($port['device_id']);
+      $title  = generate_device_link($device);
+      $title .= " :: Port  ".generate_port_link($port);
+      $title .= " :: " . formatMac($acc['mac']);
+      $auth   = TRUE;
+    }
+  } else {
+    $graph_error = "file not found";
   }
 }
 ?>