diff --git a/src/add-ons/kernel/file_systems/bfs/Inode.cpp b/src/add-ons/kernel/file_systems/bfs/Inode.cpp
index 9b463e17e2..db5d7738ba 100644
--- a/src/add-ons/kernel/file_systems/bfs/Inode.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Inode.cpp
@@ -2679,6 +2679,9 @@ Inode::Create(Transaction& transaction, Inode* parent, const char* name,
 			inode->Size()));
 		inode->SetMap(file_map_create(volume->ID(), inode->ID(),
 			inode->Size()));
+
+		if (inode->FileCache() == NULL || inode->Map() == NULL)
+			return B_NO_MEMORY;
 	}
 
 	// Everything worked well until this point, we have a fully