diff --git a/services/preview/resourcegraph/mgmt/2018-09-01/resourcegraph/CHANGELOG.md b/services/preview/resourcegraph/mgmt/2018-09-01/resourcegraph/CHANGELOG.md
deleted file mode 100644
index edcec8285884..000000000000
--- a/services/preview/resourcegraph/mgmt/2018-09-01/resourcegraph/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Generated from https://github.com/Azure/azure-rest-api-specs/tree/3c764635e7d442b3e74caf593029fcd440b3ef82
-
-Code generator @microsoft.azure/autorest.go@~2.1.161
-
-## Breaking Changes
-
-- Function `NewGraphQueryListResultPage` parameter(s) have been changed from `(func(context.Context, GraphQueryListResult) (GraphQueryListResult, error))` to `(GraphQueryListResult, func(context.Context, GraphQueryListResult) (GraphQueryListResult, error))`
-- Function `NewOperationListResultPage` parameter(s) have been changed from `(func(context.Context, OperationListResult) (OperationListResult, error))` to `(OperationListResult, func(context.Context, OperationListResult) (OperationListResult, error))`
diff --git a/services/preview/resourcegraph/mgmt/2018-09-01/resourcegraph/graphquery.go b/services/preview/resourcegraph/mgmt/2018-09-01/resourcegraph/graphquery.go
index 14af914b8659..9217369710e5 100644
--- a/services/preview/resourcegraph/mgmt/2018-09-01/resourcegraph/graphquery.go
+++ b/services/preview/resourcegraph/mgmt/2018-09-01/resourcegraph/graphquery.go
@@ -314,6 +314,7 @@ func (client GraphQueryClient) List(ctx context.Context, resourceGroupName strin
 	}
 	if result.gqlr.hasNextLink() && result.gqlr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -374,7 +375,6 @@ func (client GraphQueryClient) listNextResults(ctx context.Context, lastResults
 	result, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "resourcegraph.GraphQueryClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
diff --git a/services/preview/resourcegraph/mgmt/2018-09-01/resourcegraph/operations.go b/services/preview/resourcegraph/mgmt/2018-09-01/resourcegraph/operations.go
index 9955303e233f..c0ada4b5b597 100644
--- a/services/preview/resourcegraph/mgmt/2018-09-01/resourcegraph/operations.go
+++ b/services/preview/resourcegraph/mgmt/2018-09-01/resourcegraph/operations.go
@@ -74,6 +74,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe
 	}
 	if result.olr.hasNextLink() && result.olr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -129,7 +130,6 @@ func (client OperationsClient) listNextResults(ctx context.Context, lastResults
 	result, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "resourcegraph.OperationsClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }