diff --git a/src/acceptance/app/custom_metric_test.go b/src/acceptance/app/custom_metric_test.go
index 865ed3ffe8..b17d589a94 100644
--- a/src/acceptance/app/custom_metric_test.go
+++ b/src/acceptance/app/custom_metric_test.go
@@ -138,7 +138,6 @@ func sendMetricToAutoscaler(config *config.Config, appToScaleGUID string, metric
 		} else {
 			SendMetric(config, metricProducerAppName, metricThreshold)
 		}
-		fmt.Println("INVOKED====================")
 		return RunningInstances(appToScaleGUID, 5*time.Second)
 	}
 }
diff --git a/src/autoscaler/api/db/servicebroker.db.changelog.yaml b/src/autoscaler/api/db/servicebroker.db.changelog.yaml
index e772a3a3db..b09831d154 100644
--- a/src/autoscaler/api/db/servicebroker.db.changelog.yaml
+++ b/src/autoscaler/api/db/servicebroker.db.changelog.yaml
@@ -75,13 +75,67 @@ databaseChangeLog:
                   type: timestamp
                   constraints:
                     nullable: false
+  - changeSet:
+      id: 3
+      author: qy
+      logicalFilePath: /var/vcap/packages/golangapiserver/servicebroker.db.changelog.json
+      preConditions:
+        - onFail: MARK_RAN
+          not:
+            - foreignKeyConstraintExists:
+                foreignKeyName: fk_binding_service_instance_id
+      changes:
+        - addForeignKeyConstraint:
+            baseColumnNames: service_instance_id
+            baseTableName: binding
+            constraintName: fk_binding_service_instance_id
+            deferrable: false
+            initiallyDeferred: false
+            onDelete: RESTRICT
+            onUpdate: RESTRICT
+            referencedColumnNames: service_instance_id
+            referencedTableName: service_instance
+  - changeSet:
+      id: 4
+      author: silvestre
+      logicalFilePath: /var/vcap/packages/golangapiserver/servicebroker.db.changelog.yaml
+      preConditions:
+        - onFail: MARK_RAN
+          not:
+            - columnExists:
+                tableName: service_instance
+                columnName: default_policy
+      changes:
+        - addColumn:
+            tableName: service_instance
+            columns:
+              - column:
+                  name: default_policy
+                  type: ${policy_json.type}
+              - column:
+                  name: default_policy_guid
+                  type: varchar(50)
+  - changeSet:
+      id: 5
+      author: Arsalan
+      logicalFilePath: /var/vcap/packages/golangapiserver/servicebroker.db.changelog.yaml
+      preConditions:
+        - onFail: MARK_RAN
+          not:
+            - columnExists:
+                tableName: binding
+                columnName: custom_metrics_strategy
+      changes:
+        - addColumn:
+            tableName: binding
+            columns:
               - column:
                   name: custom_metrics_strategy
                   type: varchar(40)
                   constraints:
                     nullable: false
   - changeSet:
-      id: 3
+      id: 6
       author: Arsalan
       logicalFilePath: /var/vcap/packages/golangapiserver/servicebroker.db.changelog.json
       preConditions:
@@ -113,28 +167,15 @@ databaseChangeLog:
                   value: 'same_app'
 
   - changeSet:
-      id: 4
-      author: qy
+      id: 7
+      author: Arsalan
       logicalFilePath: /var/vcap/packages/golangapiserver/servicebroker.db.changelog.json
       preConditions:
         - onFail: MARK_RAN
           not:
-            - foreignKeyConstraintExists:
-                foreignKeyName: fk_binding_service_instance_id
             - foreignKeyConstraintExists:
                 foreignKeyName: fk_binding_custom_metrics_strategy
       changes:
-        - addForeignKeyConstraint:
-            baseColumnNames: service_instance_id
-            baseTableName: binding
-            constraintName: fk_binding_service_instance_id
-            deferrable: false
-            initiallyDeferred: false
-            onDelete: RESTRICT
-            onUpdate: RESTRICT
-            referencedColumnNames: service_instance_id
-            referencedTableName: service_instance
-
         - addForeignKeyConstraint:
             baseColumnNames: custom_metrics_strategy
             baseTableName: binding
@@ -145,23 +186,5 @@ databaseChangeLog:
             onUpdate: RESTRICT
             referencedColumnNames: custom_metrics_strategy
             referencedTableName: metrics_submission
-  - changeSet:
-      id: 5
-      author: silvestre
-      logicalFilePath: /var/vcap/packages/golangapiserver/servicebroker.db.changelog.yaml
-      preConditions:
-        - onFail: MARK_RAN
-          not:
-            - columnExists:
-                tableName: service_instance
-                columnName: default_policy
-      changes:
-        - addColumn:
-            tableName: service_instance
-            columns:
-              - column:
-                  name: default_policy
-                  type: ${policy_json.type}
-              - column:
-                  name: default_policy_guid
-                  type: varchar(50)
+
+
diff --git a/src/autoscaler/db/sqldb/binding_sqldb.go b/src/autoscaler/db/sqldb/binding_sqldb.go
index 7597541117..8a165a29f5 100644
--- a/src/autoscaler/db/sqldb/binding_sqldb.go
+++ b/src/autoscaler/db/sqldb/binding_sqldb.go
@@ -211,9 +211,10 @@ func (bdb *BindingSQLDB) CreateServiceBinding(ctx context.Context, bindingId str
 	_, err = bdb.sqldb.ExecContext(ctx, query, bindingId, serviceInstanceId, appId, time.Now(), customMetricsStrategy)
 
 	if err != nil {
-		bdb.logger.Error("create-service-binding", err, lager.Data{"query": query, "serviceinstanceid": serviceInstanceId, "bindingid": bindingId, "appid": appId, "customMetricsStrategy": customMetricsStrategy})
+		bdb.logger.Error("create-service-binding", err, lager.Data{"query": query, "serviceInstanceId": serviceInstanceId, "bindingId": bindingId, "appId": appId, "customMetricsStrategy": customMetricsStrategy})
+		return err
 	}
-	return err
+	return nil
 }
 
 func (bdb *BindingSQLDB) isBindingExists(ctx context.Context, bindingId string, serviceInstanceId string, appId string) error {
diff --git a/src/autoscaler/db/sqldb/binding_sqldb_test.go b/src/autoscaler/db/sqldb/binding_sqldb_test.go
index 018578a055..d99b5fb572 100644
--- a/src/autoscaler/db/sqldb/binding_sqldb_test.go
+++ b/src/autoscaler/db/sqldb/binding_sqldb_test.go
@@ -355,6 +355,7 @@ var _ = Describe("BindingSqldb", func() {
 	Describe("CreateServiceBinding", func() {
 
 		JustBeforeEach(func() {
+
 			err = bdb.CreateServiceBinding(context.Background(), testBindingId, testInstanceId, testAppId, customMetricsStrategy)
 		})
 		Context("When service instance doesn't exist", func() {
@@ -368,6 +369,7 @@ var _ = Describe("BindingSqldb", func() {
 			BeforeEach(func() {
 				err = bdb.CreateServiceInstance(context.Background(), models.ServiceInstance{ServiceInstanceId: testInstanceId, OrgId: testOrgGuid, SpaceId: testSpaceGuid, DefaultPolicy: policyJsonStr, DefaultPolicyGuid: policyGuid})
 				Expect(err).NotTo(HaveOccurred())
+				customMetricsStrategy = "same_app"
 			})
 
 			Context("When service binding is being created first time", func() {