Change rapidjson include path

src/controllers/remotenanokin/RemoteNanokin.cpp

@@ -21,8 +21,8 @@
 #include <iostream>
 #include <common/base/ServerProperties.h>
 #include "controllers/common/family/Families.h"
-#include "contrib/rapidjson/stringbuffer.h"
-#include "contrib/rapidjson/prettywriter.h"
+#include "rapidjson/stringbuffer.h"
+#include "rapidjson/prettywriter.h"
 
 namespace nanokin {
 
@@ -129,11 +129,12 @@ void RemoteNanokin::start() {
 
 			m_StopApplication = m_server->start(NANOKIN_STOP_CMD);
 
-			m_StartApplication->waitFor(application::STOPPED);
-			if (m_StartOutputSocket) {
-				m_StartOutputSocket->cancel();
+			if (m_StartApplication) {
+				m_StartApplication->waitFor(application::STOPPED);
+				if (m_StartOutputSocket) {
+					m_StartOutputSocket->cancel();
+				}
 			}
-
 		} catch (const std::exception & e) {
 			// Currently an exception can occur during isAvailable.
 			cout << "Unexpected exception during nanokin cameo connection: " << e.what() << endl;