diff --git a/models/issue_dependency.go b/models/issue_dependency.go
index ca6c4e23b..214ac7fbe 100644
--- a/models/issue_dependency.go
+++ b/models/issue_dependency.go
@@ -139,6 +139,10 @@ func IssueNoDependenciesLeft(issue *Issue) bool {
 	var issueDeps []IssueDependencyIssue
 
 	err := x.Join("INNER", "issue", "issue.id = issue_dependency.issue_id").Find(&issueDeps)
+	
+	if err != nil {
+		return false
+	}
 
 	for _, issueDep := range issueDeps {
 		if !issueDep.IsClosed {
@@ -146,9 +150,5 @@ func IssueNoDependenciesLeft(issue *Issue) bool {
 		}
 	}
 
-	if err != nil {
-		return false
-	}
-
 	return true
 }