diff --git a/repos/base-linux/src/lib/base/region_map_client.cc b/repos/base-linux/src/lib/base/region_map_client.cc
index 7f3364f43..63adf4341 100644
--- a/repos/base-linux/src/lib/base/region_map_client.cc
+++ b/repos/base-linux/src/lib/base/region_map_client.cc
@@ -65,5 +65,5 @@ Region_map::State Region_map_client::state() { return _local(*this)->state(); }
 
 
 Dataspace_capability Region_map_client::dataspace() {
-	return _local(*this)->dataspace(); }
+	return _local(*this) ? _local(*this)->dataspace() : Dataspace_capability(); }
 
diff --git a/repos/ports/src/noux/dataspace_registry.h b/repos/ports/src/noux/dataspace_registry.h
index c42bfa5d1..36a209f41 100644
--- a/repos/ports/src/noux/dataspace_registry.h
+++ b/repos/ports/src/noux/dataspace_registry.h
@@ -44,7 +44,7 @@ namespace Noux {
 			Dataspace_info(Dataspace_capability ds_cap)
 			:
 				Object_pool<Dataspace_info>::Entry(ds_cap),
-				_size(Dataspace_client(ds_cap).size()),
+				_size(ds_cap.valid() ? Dataspace_client(ds_cap).size() : 0),
 				_ds_cap(ds_cap)
 			{ }