diff --git a/dao/replication_job.go b/dao/replication_job.go
index 5c8e11055..f0dc7fb15 100644
--- a/dao/replication_job.go
+++ b/dao/replication_job.go
@@ -103,6 +103,9 @@ func GetRepPolicy(id int64) (*models.RepPolicy, error) {
 	var policy models.RepPolicy
 
 	if err := o.Raw(sql, id).QueryRow(&policy); err != nil {
+		if err == orm.ErrNoRows {
+			return nil, nil
+		}
 		return nil, err
 	}
 
@@ -151,6 +154,9 @@ func GetRepPolicyByName(name string) (*models.RepPolicy, error) {
 	var policy models.RepPolicy
 
 	if err := o.Raw(sql, name).QueryRow(&policy); err != nil {
+		if err == orm.ErrNoRows {
+			return nil, nil
+		}
 		return nil, err
 	}
 
diff --git a/dao/role.go b/dao/role.go
index 00281f40d..317057777 100644
--- a/dao/role.go
+++ b/dao/role.go
@@ -18,6 +18,7 @@ package dao
 import (
 	"fmt"
 
+	"github.com/astaxie/beego/orm"
 	"github.com/vmware/harbor/models"
 )
 
@@ -83,6 +84,9 @@ func GetRoleByID(id int) (*models.Role, error) {
 
 	var role models.Role
 	if err := o.Raw(sql, id).QueryRow(&role); err != nil {
+		if err == orm.ErrNoRows {
+			return nil, nil
+		}
 		return nil, err
 	}
 	return &role, nil