diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index e350644ab6fed4ac569b10b01a6664dd3d99041c..df51bc73f75fe514fa537a46f82a51afd1d8accc 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -566,7 +566,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      */
     @CheckForNull
     public Node getNode() {
-        Jenkins j = Jenkins.getInstanceOrNull();
+        Jenkins j = Jenkins.getInstanceOrNull(); // TODO confirm safe to assume non-null and use getInstance()
         if (j == null) {
             return null;
         }
@@ -1013,7 +1013,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
                     addNewExecutorIfNecessary();
                     if (!isAlive()) {
                         AbstractCIBase ciBase = Jenkins.getInstanceOrNull();
-                        if (ciBase != null) {
+                        if (ciBase != null) { // TODO confirm safe to assume non-null and use getInstance()
                             ciBase.removeComputer(Computer.this);
                         }
                     }