@@ -208,8 +208,7 @@ Environment::Environment(IsolateData* isolate_data,
   if (tracing::AgentWriterHandle* writer = GetTracingAgentWriter()) {
     trace_state_observer_ = std::make_unique<TrackingTraceStateObserver>(this);
     TracingController* tracing_controller = writer->GetTracingController();
-    if (tracing_controller != nullptr)
-      tracing_controller->AddTraceStateObserver(trace_state_observer_.get());
+    tracing_controller->AddTraceStateObserver(trace_state_observer_.get());
   }
 
   destroy_async_id_list_.reserve(512);
@@ -272,8 +271,7 @@ Environment::~Environment() {
     tracing::AgentWriterHandle* writer = GetTracingAgentWriter();
     CHECK_NOT_NULL(writer);
     TracingController* tracing_controller = writer->GetTracingController();
-    if (tracing_controller != nullptr)
-      tracing_controller->RemoveTraceStateObserver(trace_state_observer_.get());
+    tracing_controller->RemoveTraceStateObserver(trace_state_observer_.get());
   }
 
   delete[] heap_statistics_buffer_;
 
@@ -459,6 +459,7 @@ double NodePlatform::CurrentClockTimeMillis() {
 }
 
 TracingController* NodePlatform::GetTracingController() {
+  CHECK_NOT_NULL(tracing_controller_);
   return tracing_controller_;
 }
 
 
@@ -81,7 +81,9 @@ class Agent {
   ~Agent();
 
   TracingController* GetTracingController() {
-    return tracing_controller_.get();
+    TracingController* controller = tracing_controller_.get();
+    CHECK_NOT_NULL(controller);
+    return controller;
   }
 
   enum UseDefaultCategoryMode {
Original file line number	Diff line number	Diff line change
`@@ -459,6 +459,7 @@ double NodePlatform::CurrentClockTimeMillis() {`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`TracingController* NodePlatform::GetTracingController() {`
	`462`	`+ CHECK_NOT_NULL(tracing_controller_);`
`462`	`463`	`return tracing_controller_;`
`463`	`464`	`}`
`464`	`465`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,9 @@ class Agent {`
`81`	`81`	`~Agent();`
`82`	`82`
`83`	`83`	`TracingController* GetTracingController() {`
`84`		`- return tracing_controller_.get();`
	`84`	`+ TracingController* controller = tracing_controller_.get();`
	`85`	`+ CHECK_NOT_NULL(controller);`
	`86`	`+ return controller;`
`85`	`87`	`}`
`86`	`88`
`87`	`89`	`enum UseDefaultCategoryMode {`