diff --git a/pkg/secrethub/secret.go b/pkg/secrethub/secret.go
index 4f8b9987..b062bee5 100644
--- a/pkg/secrethub/secret.go
+++ b/pkg/secrethub/secret.go
@@ -111,12 +111,16 @@ func (s secretService) Get(path string) (*api.Secret, error) {
 	}
 
 	blindName, err := s.client.convertPathToBlindName(secretPath)
-	if err != nil {
+	if api.IsErrNotFound(err) {
+		return nil, &errSecretNotFound{path: secretPath, err: err}
+	} else if err != nil {
 		return nil, errio.Error(err)
 	}
 
 	encSecret, err := s.client.httpClient.GetSecret(blindName)
-	if err != nil {
+	if api.IsErrNotFound(err) {
+		return nil, &errSecretNotFound{path: secretPath, err: err}
+	} else if err != nil {
 		return nil, errio.Error(err)
 	}
 
diff --git a/pkg/secrethub/secret_version.go b/pkg/secrethub/secret_version.go
index 1c1d2c1c..1d55c16d 100644
--- a/pkg/secrethub/secret_version.go
+++ b/pkg/secrethub/secret_version.go
@@ -146,12 +146,16 @@ func (s secretVersionService) GetWithoutData(path string) (*api.SecretVersion, e
 
 func (s secretVersionService) list(path api.SecretPath, withData bool) ([]*api.SecretVersion, error) {
 	blindName, err := s.client.convertPathToBlindName(path)
-	if err != nil {
+	if api.IsErrNotFound(err) {
+		return nil, &errSecretNotFound{path: path, err: err}
+	} else if err != nil {
 		return nil, errio.Error(err)
 	}
 
 	versions, err := s.client.httpClient.ListSecretVersions(blindName, withData)
-	if err != nil {
+	if api.IsErrNotFound(err) {
+		return nil, &errSecretNotFound{path: path, err: err}
+	} else if err != nil {
 		return nil, errio.Error(err)
 	}