diff --git a/runtime/registry.go b/runtime/registry.go
index 83d17d0..2b7bd31 100644
--- a/runtime/registry.go
+++ b/runtime/registry.go
@@ -147,7 +147,7 @@ func (r *Registry) Register(keyOrPrefix string, p ValueProvider) (PushFunc, erro
 func (r *Registry) Get(key string) (record.Record, error) {
 	provider := r.getMatchingProvider(key)
 	if provider == nil {
-		return nil, nil
+		return nil, database.ErrNotFound
 	}
 
 	records, err := provider.Get(key)
diff --git a/runtime/registry_test.go b/runtime/registry_test.go
index 61343da..fe8b8a6 100644
--- a/runtime/registry_test.go
+++ b/runtime/registry_test.go
@@ -89,11 +89,11 @@ func TestRegistryGet(t *testing.T) {
 	assert.Equal(t, "p1.3", r.(*testRecord).Value)
 
 	r, err = reg.Get("p1/v4")
-	require.NoError(t, err)
+	require.Error(t, err)
 	assert.Nil(t, r)
 
 	r, err = reg.Get("no-provider/foo")
-	require.NoError(t, err)
+	require.Error(t, err)
 	assert.Nil(t, r)
 }