diff --git a/data.go b/data.go
index 74c69df..a60902c 100644
--- a/data.go
+++ b/data.go
@@ -389,8 +389,12 @@
 	}
 	defer rows.Close()
 	for rows.Next() {
-		rows.Scan(&scope)
-		if scope.Valid {
+		err = rows.Scan(&scope)
+		if err != nil {
+			log.Errorf("Failed to get scopes from EDGEX_DATA_SCOPE: %v", err)
+			return
+		}
+		if scope.Valid && scope.String != "" {
 			scopes = append(scopes, scope.String)
 		}
 	}