diff --git a/apphandler.C b/apphandler.C
index d014f5b..b8cc0aa 100644
--- a/apphandler.C
+++ b/apphandler.C
@@ -445,7 +445,9 @@
 
     printf("IPMI APP GET CHANNEL INFO\n");
 
-    // I"m only supporting channel 1.  0xE is the 'default channel'
+    // The supported channels numbers are 1 and 8.
+    // Channel Number E is used as way to identify the current channel
+    // that the command is being is received from.
     if (*p == 0xe || *p == 1 || *p == 8) {
 
         *data_len = sizeof(resp);
diff --git a/ipmid.C b/ipmid.C
index 7354958..374ede2 100644
--- a/ipmid.C
+++ b/ipmid.C
@@ -273,7 +273,7 @@
     {
         fprintf(stderr,"ERROR:[0x%X] handling NetFn:[0x%X], Cmd:[0x%X]\n",r, netfn, cmd);
 
-        if(r == -1) {
+        if(r < 0) {
            response[0] = IPMI_CC_UNSPECIFIED_ERROR;
         }
     }