commands: Fixed panic when marshalers gave nil output

ipfs · Jan 6, 2015 · 2816ed0 · 2816ed0
1 parent 97a3688
commit 2816ed0
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/commands/response.go b/commands/response.go
@@ -160,7 +160,14 @@ func (r *response) Marshal() (io.Reader, error) {
 		}
 	}
 
-	return marshaller(r)
+	output, err := marshaller(r)
+	if err != nil {
+		return nil, err
+	}
+	if output == nil {
+		return bytes.NewReader([]byte{}), nil
+	}
+	return output, nil
 }
 
 // Reader returns an `io.Reader` representing marshalled output of this Response