diff --git a/app/src/main/cpp/GPIOControl.cpp b/app/src/main/cpp/GPIOControl.cpp
index 11102abc..08831424 100644
--- a/app/src/main/cpp/GPIOControl.cpp
+++ b/app/src/main/cpp/GPIOControl.cpp
@@ -363,7 +363,10 @@ bool GpioControl::Startup()
     // if (m_thread.)
     m_exitSignal = false;
     m_thread = std::thread(PowerControlThreadProc);
-
+#ifdef _DEBUG
+    pthread_t nativeHandle = m_thread.native_handle();
+    pthread_setname_np(nativeHandle, "gpioclose");
+#endif
     return true;
 }
 
diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index 4dbd9d54..030511c0 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -441,6 +441,8 @@ CPhoneDevice::CPhoneDevice(JavaVM* vm, jobject service, const std::string& appPa
 
     RegisterHandlerForSignal(SIGUSR2);
 
+    GpioControl::Startup();
+
     LoadNetworkInfo();
 
     m_vm = vm;
@@ -533,6 +535,8 @@ CPhoneDevice::~CPhoneDevice()
         delete m_network;
         m_network = NULL;
     }
+
+    GpioControl::Stop();
 }
 
 void CPhoneDevice::SetListener(IListener* listener)