3 files changed, 23 insertions, 1 deletions
diff --git a/src/cz/crcs/ectester/reader/output/TextTestWriter.java b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
index eb52937..cc168de 100644
--- a/src/cz/crcs/ectester/reader/output/TextTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
@@ -5,6 +5,7 @@ import cz.crcs.ectester.common.test.TestSuite;
 import cz.crcs.ectester.common.test.Testable;
 import cz.crcs.ectester.common.util.ByteUtil;
 import cz.crcs.ectester.reader.CardMngr;
+import cz.crcs.ectester.reader.response.Response;
 import cz.crcs.ectester.reader.test.CardTestSuite;
 import cz.crcs.ectester.reader.test.CommandTestable;
 
@@ -27,7 +28,10 @@ public class TextTestWriter extends BaseTextTestWriter {
     protected String testableString(Testable t) {
         if (t instanceof CommandTestable) {
             CommandTestable cmd = (CommandTestable) t;
-            return writer.responseSuffix(cmd.getResponse());
+            Response response = cmd.getResponse();
+            if (response != null) {
+                return writer.responseSuffix(response);
+            }
         }
         return "";
     }
diff --git a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
index d3674e8..ebe07a6 100644
--- a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
@@ -26,16 +26,27 @@ public class XMLTestWriter extends BaseXMLTestWriter {
 
     private Element commandElement(Command c) {
         Element commandElem = doc.createElement("command");
+        if (c == null) {
+            return commandElem;
+        }
 
         Element apdu = doc.createElement("apdu");
         apdu.setTextContent(ByteUtil.bytesToHex(c.getAPDU().getBytes()));
         commandElem.appendChild(apdu);
 
+        Element description = doc.createElement("desc");
+        description.setTextContent(c.getDescription());
+        commandElem.appendChild(description);
+
         return commandElem;
     }
 
     private Element responseElement(Response r) {
         Element responseElem = doc.createElement("response");
+        if (r == null) {
+            return responseElem;
+        }
+
         responseElem.setAttribute("successful", r.successful() ? "true" : "false");
 
         Element apdu = doc.createElement("apdu");
diff --git a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
index 199f2c0..4f83ca8 100644
--- a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
@@ -27,12 +27,19 @@ public class YAMLTestWriter extends BaseYAMLTestWriter {
 
     private Map<String, Object> commandObject(Command c) {
         Map<String, Object> commandObj = new HashMap<>();
+        if (c == null) {
+            return commandObj;
+        }
         commandObj.put("apdu", ByteUtil.bytesToHex(c.getAPDU().getBytes()));
+        commandObj.put("desc", c.getDescription());
         return commandObj;
     }
 
     private Map<String, Object> responseObject(Response r) {
         Map<String, Object> responseObj = new HashMap<>();
+        if (r == null) {
+            return responseObj;
+        }
         responseObj.put("successful", r.successful());
         responseObj.put("apdu", ByteUtil.bytesToHex(r.getAPDU().getBytes()));
         responseObj.put("natural_sw", Short.toUnsignedInt(r.getNaturalSW()));