4 files changed, 6 insertions, 6 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index a02a3227..a9d8f44b 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -96,7 +96,7 @@ ClientStore::remove_object(const Raul::Path& path)
 	// Find the object, the "top" of the tree to remove
 	const iterator top = find(path);
 	if (top == end()) {
-		return SPtr<ObjectModel>();
+		return nullptr;
 	}
 
 	auto object = std::dynamic_pointer_cast<ObjectModel>(top->second);
@@ -158,7 +158,7 @@ ClientStore::_object(const Raul::Path& path)
 {
 	const iterator i = find(path);
 	if (i == end()) {
-		return SPtr<ObjectModel>();
+		return nullptr;
 	} else {
 		auto model = std::dynamic_pointer_cast<ObjectModel>(i->second);
 		assert(model);
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index 4de2cb53..b965258e 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -105,7 +105,7 @@ GraphModel::get_arc(const Node* tail, const Node* head)
 	if (i != _arcs.end()) {
 		return std::dynamic_pointer_cast<ArcModel>(i->second);
 	} else {
-		return SPtr<ArcModel>();
+		return nullptr;
 	}
 }
 
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index f72d8a3a..b3a9aecd 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -245,7 +245,7 @@ SPtr<PluginUI>
 PluginModel::ui(ingen::World& world, const SPtr<const BlockModel>& block) const
 {
 	if (!_lilv_plugin) {
-		return SPtr<PluginUI>();
+		return nullptr;
 	}
 
 	return PluginUI::create(world, block, _lilv_plugin);
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 1074be3e..b0f92e41 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -40,7 +40,7 @@ get_port(PluginUI* ui, uint32_t port_index)
 		ui->world().log().error("%1% UI tried to access invalid port %2%\n",
 		                        ui->block()->plugin()->uri().c_str(),
 		                        port_index);
-		return SPtr<const PortModel>();
+		return nullptr;
 	}
 	return ui->block()->ports()[port_index];
 }
@@ -211,7 +211,7 @@ PluginUI::create(ingen::World&                 world,
 
 	if (!ui) {
 		lilv_node_free(gtk_ui);
-		return SPtr<PluginUI>();
+		return nullptr;
 	}
 
 	// Create the PluginUI, but don't instantiate yet