diff --git a/ctxcdb/remotedb/remotedb.go b/ctxcdb/remotedb/remotedb.go
index 66cd0f3fba..8d1490a20f 100644
--- a/ctxcdb/remotedb/remotedb.go
+++ b/ctxcdb/remotedb/remotedb.go
@@ -34,7 +34,7 @@ type Database struct {
 
 func (db *Database) Has(key []byte) (bool, error) {
 	if _, err := db.Get(key); err != nil {
-		return false, nil
+		return false, err
 	}
 	return true, nil
 }
@@ -50,7 +50,7 @@ func (db *Database) Get(key []byte) ([]byte, error) {
 
 func (db *Database) HasAncient(kind string, number uint64) (bool, error) {
 	if _, err := db.Ancient(kind, number); err != nil {
-		return false, nil
+		return false, err
 	}
 	return true, nil
 }
@@ -152,7 +152,8 @@ func (db *Database) Close() error {
 }
 
 func New(client *rpc.Client) ctxcdb.Database {
-	return &Database{
-		remote: client,
+	if client == nil {
+		return nil
 	}
+	return &Database{remote: client}
 }