diff --git a/.idea/runConfigurations/MIB_Objects.xml b/.idea/runConfigurations/MIB_Objects.xml
deleted file mode 100644
index bb0256d0e8ea22bce9e9fcbd0d7527b63af1a55e..0000000000000000000000000000000000000000
--- a/.idea/runConfigurations/MIB_Objects.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="MIB_Objects" type="PythonConfigurationType" factoryName="Python" folderName="MIB">
-    <module name="generators" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../generators/objects" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../generators/objects/MIB_Objects.py" />
-    <option name="PARAMETERS" value="" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="false" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/OBSW_TmTc_Client_Service_17_Test_Serial.xml b/.idea/runConfigurations/OBSW_TmTc_Client_Service_17_Test_Serial.xml
deleted file mode 100644
index 0dd68ef49a0a404274a328d196f468549d47e4da..0000000000000000000000000000000000000000
--- a/.idea/runConfigurations/OBSW_TmTc_Client_Service_17_Test_Serial.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OBSW_TmTc Client Service 17 Test Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial Communication">
-    <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/OBSW_TmTcClient.py" />
-    <option name="PARAMETERS" value="-m 3 -s 17 -c 1 -p" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="true" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/OBSW_TmTcClient.py b/OBSW_TmTcClient.py
index ca7def3309c794df6ea73bb6e127f2c569f790d8..73c2944c7c2229994b69eb97bafa0a35c2eecec2 100644
--- a/OBSW_TmTcClient.py
+++ b/OBSW_TmTcClient.py
@@ -119,11 +119,12 @@ def main():
 def commandPreparation():
     # Direct command which triggers an additional step reply and one completion reply
     # Single Command Testing
-    #command = PUSTelecommand(service=17, subservice=1, SSC=21)
-    file = bytearray([1, 2, 3, 4, 5])
-    command = PUSTelecommand(service=23, subservice=1, SSC=21, data=file)
-    command.packCommandTuple()
-    return command.packCommandTuple()
+    command = PUSTelecommand(service=17, subservice=1, SSC=21)
+    command.print()
+    # file = bytearray([1, 2, 3, 4, 5])
+    # command = PUSTelecommand(service=23, subservice=1, SSC=21, data=file)
+    # command.packCommandTuple()
+    # return command.packCommandTuple()
 
 
 def setUpSocket():
diff --git a/sendreceive/OBSW_SingleCommandSenderReceiver.py b/sendreceive/OBSW_SingleCommandSenderReceiver.py
index 4b025b7fcdaf2ae202eda8cb62ac111b07ba93f0..d686b05b8ea6a494799daf9167d535854ae3f739 100644
--- a/sendreceive/OBSW_SingleCommandSenderReceiver.py
+++ b/sendreceive/OBSW_SingleCommandSenderReceiver.py
@@ -18,7 +18,11 @@ class SingleCommandSenderReceiver(CommandSenderReceiver):
     def __init__(self, comInterface, displayMode, pusPacketTuple, tmTimeout, tcTimeoutFactor, doPrintToFile):
         super().__init__(comInterface, displayMode, tmTimeout, tcTimeoutFactor, doPrintToFile)
         self.pusPacketTuple = pusPacketTuple
-        (self.pusPacketInfo, self.pusPacket) = self.pusPacketTuple
+        try:
+            (self.pusPacketInfo, self.pusPacket) = self.pusPacketTuple
+        except TypeError:
+            print("Invalid queue entry detected")
+            exit()
 
     def sendSingleTcAndReceiveTm(self):
         print("Starting listener thread")
diff --git a/tc/OBSW_TcPacket.py b/tc/OBSW_TcPacket.py
index 9548dad4c5ea656650bd28fdb5b712ad7f05c72d..8151e0d3a11bf03be9abfb835a61198d0f852325 100644
--- a/tc/OBSW_TcPacket.py
+++ b/tc/OBSW_TcPacket.py
@@ -65,6 +65,16 @@ class PUSTelecommand:
         commandTuple = (self.packInformation(), self.pack())
         return commandTuple
 
+    def print(self):
+        packet = self.pack()
+        print("Command in Hexadecimal: [", end="")
+        for counter in range(len(packet)):
+            if counter == len(packet) - 1:
+                print(str(hex(packet[counter])), end="")
+            else:
+                print(str(hex(packet[counter])) + ", ", end="")
+        print("]")
+
 
 # Takes pusPackets, removes current Packet Error Control, calculates new CRC (16 bits at packet end) and
 # adds it as correct Packet Error Control Code. Reference: ECSS-E70-41A p. 207-212