diff --git a/shared/source/command_stream/linear_stream.h b/shared/source/command_stream/linear_stream.h
index 6243e512a3..7eee2a7718 100644
--- a/shared/source/command_stream/linear_stream.h
+++ b/shared/source/command_stream/linear_stream.h
@@ -62,6 +62,7 @@ inline void *LinearStream::getSpace(size_t size) {
         cmdContainer->closeAndAllocateNextCommandBuffer();
     }
     UNRECOVERABLE_IF(sizeUsed + size > maxAvailableSpace);
+    UNRECOVERABLE_IF(reinterpret_cast<int64_t>(buffer) <= 0);
     auto memory = ptrOffset(buffer, sizeUsed);
     sizeUsed += size;
     return memory;
diff --git a/shared/test/unit_test/command_stream/linear_stream_tests.cpp b/shared/test/unit_test/command_stream/linear_stream_tests.cpp
index a65c92b087..417ee1b144 100644
--- a/shared/test/unit_test/command_stream/linear_stream_tests.cpp
+++ b/shared/test/unit_test/command_stream/linear_stream_tests.cpp
@@ -37,6 +37,17 @@ TEST_F(LinearStreamTest, GivenSizeUint32WhenGettingSpaceUsedThenNonNullPointerIs
     EXPECT_NE(nullptr, linearStream.getSpace(sizeof(uint32_t)));
 }
 
+TEST_F(LinearStreamTest, GivenNullBufferWhenGettingSpaceThenAssert) {
+    linearStream.replaceBuffer(nullptr, 100);
+    EXPECT_THROW(linearStream.getSpace(1), std::exception);
+}
+
+TEST_F(LinearStreamTest, GivenBadBufferPtrWhenGettingSpaceThenAssert) {
+    int64_t ptr = -1;
+    linearStream.replaceBuffer(reinterpret_cast<void *>(ptr), 100);
+    EXPECT_THROW(linearStream.getSpace(1), std::exception);
+}
+
 TEST_F(LinearStreamTest, WhenAllocatingMultipleTimesThenPointersIncrementedCorrectly) {
     size_t allocSize = 1;
     auto ptr1 = linearStream.getSpace(allocSize);