diff --git a/src/Composer/Command/DiagnoseCommand.php b/src/Composer/Command/DiagnoseCommand.php
index dbfad7829..9dccfced3 100644
--- a/src/Composer/Command/DiagnoseCommand.php
+++ b/src/Composer/Command/DiagnoseCommand.php
@@ -385,23 +385,42 @@ EOT
     private function outputResult($result)
     {
         $io = $this->getIO();
+        $hadError = false;
         if (true === $result) {
             $io->write('<info>OK</info>');
+            return;
+        }
+
+        if ($result instanceof \Exception) {
+            $result = '<error>['.get_class($result).'] '.$result->getMessage().'</error>';
+        }
+
+        if (!$result) {
+            // falsey results should be considered as an error, even if there is nothing to output
+            $hadError = true;
         } else {
-            $this->failures++;
-            $io->write('<error>FAIL</error>');
-            if ($result instanceof \Exception) {
-                $io->write('['.get_class($result).'] '.$result->getMessage());
-            } elseif ($result) {
-                if (is_array($result)) {
-                    foreach ($result as $message) {
-                        $io->write($message);
-                    }
-                } else {
-                    $io->write($result);
+            if (!is_array($result)) {
+                $result = array($result);
+            }
+            foreach ($result as $message) {
+                if (false !== strpos($message, '<error>')) {
+                    $hadError = true;
                 }
             }
         }
+
+        if ($hadError) {
+            $io->write('<error>FAIL</error>');
+            $this->failures++;
+        } else {
+            $io->write('<warning>WARNING</warning>');
+        }
+
+        if ($result) {
+            foreach ($result as $message) {
+                $io->write($message);
+            }
+        }
     }
 
     private function checkPlatform()