TestApplication.Stop.CallingTwiceCheck.diff

diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
index 829c221e9..192686737 100644
--- a/core/internal/cltest/cltest.go
+++ b/core/internal/cltest/cltest.go
@@ -142,6 +142,7 @@ type TestApplication struct {
 	wsServer         *httptest.Server
 	connectedChannel chan struct{}
 	Started          bool
+	stoppedOnce      bool
 }
 
 func newWSServer() (*httptest.Server, func()) {
@@ -298,6 +299,10 @@ func (ta *TestApplication) Stop() error {
 		ta.t.Fatal("TestApplication Stop() called on an unstarted application")
 	}
 
+	if ta.stoppedOnce {
+		ta.t.Log("******** TestApplication#StoppedTWICE()") // Searching for double calls
+	}
+	ta.stoppedOnce = true
 	// TODO: Here we double close, which is less than ideal.
 	// We would prefer to invoke a method on an interface that
 	// cleans up only in test.