diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
index dde02f2ed..446c5d16c 100644
--- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp
+++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
@@ -828,6 +828,7 @@ int UDPStandardImplementation::SetupFifoStructure() {
             for (std::vector<Fifo*>::const_iterator it = fifo.begin(); it != fifo.end(); ++it)
                 delete(*it);
             fifo.clear();
+			fifoDepth = 0;
             return FAIL;
 	    }
 		//set the listener & dataprocessor threads to point to the right fifo
diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
index 4617b9c55..e334cd24a 100644
--- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
@@ -1906,14 +1906,14 @@ int slsReceiverTCPIPInterface::set_fifo_depth() {
 			else {
 				ret = receiverBase->setFifoDepth(value);
 				if (ret == FAIL) {
-					strcpy(mess,"Could not set fifo depth");
+					strcpy(mess,"Could not set fifo depth\n");
 					FILE_LOG(logERROR) << mess;
 				}
 			}
 		}
 		//get
 		retval = receiverBase->getFifoDepth();
-		if(value >= 0 && retval != value) {
+		if(ret == OK && value >= 0 && retval != value) {
 			ret = FAIL;
 			strcpy(mess, "Could not set fifo depth\n");
 			FILE_LOG(logERROR) << mess;