diff --git a/modules/change_detection/src/change_detector.js b/modules/change_detection/src/change_detector.js
index ef8a989842..7f2fa273e1 100644
--- a/modules/change_detection/src/change_detector.js
+++ b/modules/change_detection/src/change_detector.js
@@ -23,7 +23,7 @@ export class ChangeDetector {
       var currentGroup = record.groupMemento();
 
       if (record.check()) {
-        count ++;
+        count++;
         if (record.terminatesExpression()) {
           updatedRecords = this._addRecord(updatedRecords, record);
         }
diff --git a/modules/change_detection/src/record_range.js b/modules/change_detection/src/record_range.js
index 684ef3f7b8..3e306ddc1a 100644
--- a/modules/change_detection/src/record_range.js
+++ b/modules/change_detection/src/record_range.js
@@ -57,11 +57,11 @@ export class ProtoRecordRange {
     if (this.recordCreator === null) {
       this.recordCreator = new ProtoRecordCreator(this);
     }
-    
+
     if (content) {
       ast = new Collection(ast);
     }
-    
+
     this.recordCreator.createRecordsFromAST(ast, expressionMemento, groupMemento);
   }
 
@@ -149,14 +149,13 @@ export class RecordRange {
 
   remove() {
     var firstEnabledChildRecord = this.findFirstEnabledRecord();
-    var lastEnabledChildRecord = this.findLastEnabledRecord();
-
     var next = this.tailRecord.next;
     var prev = this.headRecord.prev;
 
     _link(prev, next);
 
     if (isPresent(firstEnabledChildRecord)) {
+      var lastEnabledChildRecord = this.findLastEnabledRecord();
       var nextEnabled = lastEnabledChildRecord.nextEnabled;
       var prevEnabled = firstEnabledChildRecord.prevEnabled;
       if (isPresent(nextEnabled)) nextEnabled.prevEnabled = prevEnabled;
@@ -191,16 +190,14 @@ export class RecordRange {
 
   disable() {
     var firstEnabledChildRecord = this.findFirstEnabledRecord();
-    var lastEnabledChildRecord = this.findLastEnabledRecord();
-
-    var nextEnabled = isPresent(lastEnabledChildRecord) ?
-        lastEnabledChildRecord.nextEnabled : null;
-
-    var prevEnabled = isPresent(firstEnabledChildRecord) ?
-        firstEnabledChildRecord.prevEnabled : null;
-
-    if (isPresent(nextEnabled)) nextEnabled.prevEnabled = prevEnabled;
-    if (isPresent(prevEnabled)) prevEnabled.nextEnabled = nextEnabled;
+    if (isPresent(firstEnabledChildRecord)) {
+      // There could be a last enabled record only if first enabled exists
+      var lastEnabledChildRecord = this.findLastEnabledRecord();
+      var nextEnabled = lastEnabledChildRecord.nextEnabled;
+      var prevEnabled = firstEnabledChildRecord.prevEnabled;
+      if (isPresent(nextEnabled)) nextEnabled.prevEnabled = prevEnabled;
+      if (isPresent(prevEnabled)) prevEnabled.nextEnabled = nextEnabled;
+    }
 
     this.disabled = true;
   }