diff --git a/xplat/Flipper/FlipperStep.cpp b/xplat/Flipper/FlipperStep.cpp
index 2cc4d1cf2..5ce197d99 100644
--- a/xplat/Flipper/FlipperStep.cpp
+++ b/xplat/Flipper/FlipperStep.cpp
@@ -1,12 +1,14 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
 #include "FlipperStep.h"
 #include "FlipperState.h"
+#include "Log.h"
+
+using facebook::flipper::log;
 
 void FlipperStep::complete() {
   isLogged = true;
@@ -25,6 +27,13 @@ FlipperStep::FlipperStep(std::string step, FlipperState* s) {
 
 FlipperStep::~FlipperStep() {
   if (!isLogged) {
-    state->failed(name, "");
+    try {
+      state->failed(name, "");
+    } catch (std::exception& e) {
+      log(std::string("Exception occurred in FlipperStep destructor: ") +
+          e.what());
+    } catch (...) {
+      log("Exception occurred in FlipperStep destructor");
+    }
   }
 }