diff --git a/sites/all/modules/uc_tracking/uc_tracking.module b/sites/all/modules/uc_tracking/uc_tracking.module
index 9563ac0..d30f3a6 100644
--- a/sites/all/modules/uc_tracking/uc_tracking.module
+++ b/sites/all/modules/uc_tracking/uc_tracking.module
@@ -454,17 +454,24 @@ function uc_fedex_uc_tracking($tracking_number) {
       }
     }
     else {
-      drupal_set_message(t('Error in processing FedEx tracking transaction.'), 'error');
-      foreach ($response->Notifications as $notification) {
-        if (is_array($response->Notifications)) {
-          drupal_set_message($notification->Severity .': '.
+      //drupal_set_message(t('Error in processing FedEx tracking transaction.'), 'error');
+      if (is_array($response->Notifications)) {
+				foreach ($response->Notifications as $notification) {
+        	drupal_set_message($notification->Severity .': '.
                              $notification->Message, 'error');
         }
-        else {
-          drupal_set_message($notification, 'error');
-        }
+			}
+      else {
+          drupal_set_message($response->Notifications->Severity .': '.
+                             $response->Notifications->Message, 'error');
       }
-      $details['status'] = 'ERROR';
+      
+      if ($response->Notifications->Code == '9040') {
+				$details['status'] = 'Shipment has not yet left the store';
+			}else{
+				$details['status'] = 'ERROR';
+			}
+			
     }
     return $details;
   }