2 files changed, 8 insertions, 2 deletions
diff --git a/Sluift/SluiftClient.cpp b/Sluift/SluiftClient.cpp
index e8c43c9..5243ed0 100644
--- a/Sluift/SluiftClient.cpp
+++ b/Sluift/SluiftClient.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2013-2017 Isode Limited.
+ * Copyright (c) 2013-2018 Isode Limited.
  * All rights reserved.
@@ -50,2 +50,5 @@ SluiftClient::~SluiftClient() {
 void SluiftClient::connect() {
+    if (client->isActive()) {
+        throw Lua::Exception("Client is already connecting or connected");
+    }
     rosterReceived = false;
diff --git a/Sluift/SluiftComponent.cpp b/Sluift/SluiftComponent.cpp
index e1d1738..126562e 100644
--- a/Sluift/SluiftComponent.cpp
+++ b/Sluift/SluiftComponent.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2018 Isode Limited.
  * All rights reserved.
@@ -43,2 +43,5 @@ SluiftComponent::~SluiftComponent() {
 void SluiftComponent::connect(const std::string& host, int port) {
+    if (component->isActive()) {
+        throw Lua::Exception("Component is already connecting or connected");
+    }
     disconnectedError = boost::optional<ComponentError>();