diff --git a/internal/cron/monitor.go b/internal/cron/monitor.go
index 153afb0..b79ec38 100644
--- a/internal/cron/monitor.go
+++ b/internal/cron/monitor.go
@@ -80,10 +80,19 @@ func evaluateJob(ctx context.Context, logger *logrus.Logger, store *Store, job J
 				if err := store.FailJob(ctx, job.ID, -1, "machine destroyed before we could interpret the results"); err != nil {
 					log.WithError(err).Errorf("failed to update job %d status", job.ID)
 				}
-				return nil
+			} else {
+				log.WithError(err).Errorf("failed to get machine %s", job.MachineID.String)
 			}
+		} else {
 			log.WithError(err).Errorf("failed to get machine %s: %v", job.MachineID.String, err)
 		}
+
+		return nil
+	}
+
+	if machine == nil {
+		log.Errorf("job %d has a nil machine %s", job.ID, job.MachineID.String)
+		return nil
 	}
 
 	log.Debugf("Monitoring job")