commands: Fixed panic when trying to marshal without a command set in…

… request
ipfs · Nov 4, 2014 · feec8b1 · feec8b1
1 parent bfcf531
commit feec8b1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/commands/response.go b/commands/response.go
@@ -115,7 +115,10 @@ func (r *response) Marshal() ([]byte, error) {
 	}
 	encType := EncodingType(strings.ToLower(encStr))
 
-	marshaller := r.req.Command().Marshallers[encType]
+	var marshaller Marshaller
+	if r.req.Command() != nil && r.req.Command().Marshallers != nil {
+		marshaller = r.req.Command().Marshallers[encType]
+	}
 	if marshaller == nil {
 		marshaller, ok = marshallers[encType]
 		if !ok {