diff --git a/src/Packet.cpp b/src/Packet.cpp
index ec05ee78908eead6f8b806c2592e1b469e03197c..eafcc70b25cf86277480bf26e3e45e656793ee2e 100644
--- a/src/Packet.cpp
+++ b/src/Packet.cpp
@@ -1108,9 +1108,9 @@ ByteStreamPtr Packet::compressData(enum CompressionAlgorithms compressionAlgorit
 
 ByteStreamPtr Packet::getBSTail() {
 	//dword dimvariablepart = packet->size() - dimPrefix - dimPacketStartingFixedPart - dimPacketTail;
-	ByteStreamPtr tail = 0;
-	if(dimPacketTail > 0)
-		ByteStreamPtr tail = ByteStreamPtr(new ByteStream(packet->stream + packet->size() - dimPacketTail, dimPacketTail, bigendian));
+	if(dimPacketTail <= 0)
+		return 0;
+	ByteStreamPtr tail = ByteStreamPtr(new ByteStream(packet->stream + packet->size() - dimPacketTail, dimPacketTail, bigendian));
 	return tail;
 }