diff --git a/src/psm/Txtmsg/Callr.php b/src/psm/Txtmsg/Callr.php
index c4764b14..8928cca6 100644
--- a/src/psm/Txtmsg/Callr.php
+++ b/src/psm/Txtmsg/Callr.php
@@ -81,8 +81,9 @@ class Callr extends Core {
 			
 			$result = json_decode(curl_exec($curl), true);
 			$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+			$err = curl_errno($curl);
 
-			if ($err = curl_errno($curl) || $httpcode != 200 || $result['status'] == "error") {
+			if ($err != 0 || $httpcode != 200 || $result['status'] == "error") {
 				$success = 0;
 					$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err).". Result: ".$result['data']['code']." - ".$result['data']['message'];
 			}
diff --git a/src/psm/Txtmsg/ClickSend.php b/src/psm/Txtmsg/ClickSend.php
index b0408ddb..b797805b 100644
--- a/src/psm/Txtmsg/ClickSend.php
+++ b/src/psm/Txtmsg/ClickSend.php
@@ -85,8 +85,9 @@ class ClickSend extends Core {
 		
 		$result = json_decode(curl_exec($curl), true);
 		$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+		$err = curl_errno($curl);
 		
-		if ($err = curl_errno($curl) || ($httpcode != '200' && $httpcode != '201' && $httpcode != '202' && $result['response_code'] != "SUCCESS")) {
+		if ($err != 0 || ($httpcode != '200' && $httpcode != '201' && $httpcode != '202' && $result['response_code'] != "SUCCESS")) {
 			$success = 0;
 			$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err).". Result: ".$result."";
 		}
diff --git a/src/psm/Txtmsg/FreeMobileSMS.php b/src/psm/Txtmsg/FreeMobileSMS.php
index 892df76c..ff283428 100644
--- a/src/psm/Txtmsg/FreeMobileSMS.php
+++ b/src/psm/Txtmsg/FreeMobileSMS.php
@@ -59,11 +59,11 @@ class FreeMobileSMS extends Core {
 				)
 			)
 		);
-		
-		$result = curl_exec($curl);
+
 		$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+		$err = curl_errno($curl);
 		
-		if ($err = curl_errno($curl) || $httpcode != 200) {
+		if ($err != 0 || $httpcode != 200) {
 			$success = 0;
 				$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err);
 		}
diff --git a/src/psm/Txtmsg/FreeVoipDeal.php b/src/psm/Txtmsg/FreeVoipDeal.php
index 371a6a6b..7fef4192 100755
--- a/src/psm/Txtmsg/FreeVoipDeal.php
+++ b/src/psm/Txtmsg/FreeVoipDeal.php
@@ -70,10 +70,10 @@ class FreeVoipDeal extends Core {
 			curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 			
 			$result = curl_exec($curl);
-			$err = curl_error($curl);
+			$err = curl_errno($curl);
 			curl_close($curl);
 			
-			if ($err || is_numeric(strpos($result, "failure"))) {
+			if ($err != 0 || is_numeric(strpos($result, "failure"))) {
 				$success = 0;
 				$error = $result;
 			}
diff --git a/src/psm/Txtmsg/GatewayAPI.php b/src/psm/Txtmsg/GatewayAPI.php
index 7229ff6e..b73936f9 100644
--- a/src/psm/Txtmsg/GatewayAPI.php
+++ b/src/psm/Txtmsg/GatewayAPI.php
@@ -76,10 +76,10 @@ class GatewayAPI extends Core {
 
 		$result = json_decode(curl_exec($curl), true);
 		$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		$err = curl_error($curl);
+		$err = curl_errno($curl);
 		curl_close($curl);
 
-		if ($err || $httpcode != 200) {
+		if ($err != 0 || $httpcode != 200) {
 			$success = 0;
 			$error = $result['code']." - ".$result['message'];
 		}
diff --git a/src/psm/Txtmsg/Inetworx.php b/src/psm/Txtmsg/Inetworx.php
index dbb3427d..92aff4d2 100644
--- a/src/psm/Txtmsg/Inetworx.php
+++ b/src/psm/Txtmsg/Inetworx.php
@@ -80,11 +80,12 @@ class Inetworx extends Core {
 			));
 
 			$result = curl_exec($curl);
+			$err = curl_errno($curl);
 
 			$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-			if ($err = curl_errno($curl) || $httpcode != 200 || strpos($result, "200") === false) {
+			if ($err != 0 || $httpcode != 200 || strpos($result, "200") === false) {
 				$success = 0;
-					$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err).". \nResult: ".$result;
+				$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err).". \nResult: ".$result;
 			}
 			curl_close($curl);
 		}
diff --git a/src/psm/Txtmsg/Mosms.php b/src/psm/Txtmsg/Mosms.php
index 7b093567..cdac5cbc 100644
--- a/src/psm/Txtmsg/Mosms.php
+++ b/src/psm/Txtmsg/Mosms.php
@@ -71,11 +71,11 @@ class Mosms extends Core {
 			$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 			
 			$result = curl_exec($curl);
-			$err = curl_error($curl);
+			$err = curl_errno($curl);
 			
-			if ($err = curl_errno($curl) || $httpcode != 200 || $result == 2 || $result == 5) {
+			if ($err != 0 || $httpcode != 200 || $result == 2 || $result == 5) {
 				$success = 0;
-				$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err).". \nResult: ".$result;
+				$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".$err.". \nResult: ".$result;
 			}
 			curl_close($curl);
 			
diff --git a/src/psm/Txtmsg/Nexmo.php b/src/psm/Txtmsg/Nexmo.php
index efe4dba5..79986415 100644
--- a/src/psm/Txtmsg/Nexmo.php
+++ b/src/psm/Txtmsg/Nexmo.php
@@ -73,10 +73,9 @@ class Nexmo extends Core {
 			
 			$result = json_decode(curl_exec($curl), true);
 			$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+			$err = curl_errno($curl);
 			
-			$err = curl_error($curl);
-			
-			if ($err = curl_errno($curl) || $httpcode != 200 || $result['messages'][0]['status'] != "0") {
+			if ($err != 0 || $httpcode != 200 || $result['messages'][0]['status'] != "0") {
 				$success = 0;
 				$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err).". \nResult: ".$result['messages'][0]['error-text'];
 			}
diff --git a/src/psm/Txtmsg/Octopush.php b/src/psm/Txtmsg/Octopush.php
index 32b01750..721ef338 100644
--- a/src/psm/Txtmsg/Octopush.php
+++ b/src/psm/Txtmsg/Octopush.php
@@ -79,8 +79,9 @@ class Octopush extends Core {
 		$result = curl_exec($curl);
 		$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 		$xmlResults = simplexml_load_string($result);
+		$err = curl_errno($curl);
 
-		if ($err = curl_errno($curl) || $httpcode != 200 || $xmlResults === false || $xmlResults->error_code != '000') {
+		if ($err != 0 || $httpcode != 200 || $xmlResults === false || $xmlResults->error_code != '000') {
 			$success = 0;
 			$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err).". \nResult: ".$xmlResults->error_code.". Look at http://www.octopush-dm.com/en/errors for the error description.";
 		}
diff --git a/src/psm/Txtmsg/Plivo.php b/src/psm/Txtmsg/Plivo.php
index 267ca804..2e70b40f 100644
--- a/src/psm/Txtmsg/Plivo.php
+++ b/src/psm/Txtmsg/Plivo.php
@@ -82,7 +82,9 @@ class Plivo extends Core {
 		
 		$result = curl_exec($curl);
 		$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		if ($err = curl_errno($curl) || ($httpcode != '200' && $httpcode != '201' && $httpcode != '202')) {
+		$err = curl_errno($curl);
+		
+		if ($err != 0 || ($httpcode != '200' && $httpcode != '201' && $httpcode != '202')) {
 			$success = 0;
 			$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err).". Result: ".$result."";
 		}
diff --git a/src/psm/Txtmsg/Smsglobal.php b/src/psm/Txtmsg/Smsglobal.php
index e234e47b..b0e4c9de 100644
--- a/src/psm/Txtmsg/Smsglobal.php
+++ b/src/psm/Txtmsg/Smsglobal.php
@@ -77,9 +77,9 @@ class Smsglobal extends Core {
 		$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 			
 		$result = curl_exec($curl);
-		$err = curl_error($curl);
+		$err = curl_errno($curl);
 			
-		if ($err = curl_errno($curl) || substr($result, 0, 5) != "OK: 0") {
+		if ($err != 0 || substr($result, 0, 5) != "OK: 0") {
 			$success = 0;
 			$result = ($result == '') ? 'Wrong input, please check if all values are correct!' : $result;
 			$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err).". \nResult: ".$result;
diff --git a/src/psm/Txtmsg/Smsgw.php b/src/psm/Txtmsg/Smsgw.php
index 8abb9f33..77f1ab14 100644
--- a/src/psm/Txtmsg/Smsgw.php
+++ b/src/psm/Txtmsg/Smsgw.php
@@ -74,7 +74,9 @@ class Smsgw extends Core {
 
 		$result = curl_exec($curl);
 		$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		if ($err = curl_errno($curl) || ($httpcode != '200' && $httpcode != '201' && $httpcode != '202' && $result != "1")) {
+		$err = curl_errno($curl);
+		
+		if ($err != 0 || ($httpcode != '200' && $httpcode != '201' && $httpcode != '202' && $result != "1")) {
 			$success = 0;
 			$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err).". Result: ".$result."";
 		}
diff --git a/src/psm/Txtmsg/Smsit.php b/src/psm/Txtmsg/Smsit.php
index 7f199f88..8ff5cb99 100644
--- a/src/psm/Txtmsg/Smsit.php
+++ b/src/psm/Txtmsg/Smsit.php
@@ -68,10 +68,10 @@ class Smsit extends Core {
 			);
 			
 			$result = curl_exec($curl);
-			$err = curl_error($curl);
+			$err = curl_errno($curl);
 			curl_close($curl);
 			
-			if ($err || is_numeric(strpos($result, "{\"errors\":[{\"code\":"))) {
+			if ($err != 0 || is_numeric(strpos($result, "{\"errors\":[{\"code\":"))) {
 				$success = 0;
 				$error = $result;
 			}
diff --git a/src/psm/Txtmsg/SolutionsInfini.php b/src/psm/Txtmsg/SolutionsInfini.php
index 96a38f99..10291704 100644
--- a/src/psm/Txtmsg/SolutionsInfini.php
+++ b/src/psm/Txtmsg/SolutionsInfini.php
@@ -69,12 +69,13 @@ class SolutionsInfini extends Core {
 			)
 		);
 		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-		$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 
 
 		$result = json_decode(curl_exec($curl), true);
 		$httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		if ($err = curl_errno($curl) || $httpcode != 200 || $result['status'] != "OK") {
+		$err = curl_errno($curl);
+
+		if ($err != 0 || $httpcode != 200 || $result['status'] != "OK") {
 			$success = 0;
 			$error = "HTTP_code: ".$httpcode.".\ncURL error (".$err."): ".curl_strerror($err).". Result: ".$result['status']." - ".$result['message'].".";
 		}