diff --git a/include/freerdp/error.h b/include/freerdp/error.h
index c3ad97aef..9cd8f4daa 100755
--- a/include/freerdp/error.h
+++ b/include/freerdp/error.h
@@ -193,42 +193,43 @@ FREERDP_API extern int connectErrorCode;
 
 #define GET_FREERDP_ERROR_SUBCODE
 
-#define FREERDP_ERROR_BASE							0
+#define FREERDP_ERROR_BASE						0
 
-#define FREERDP_ERROR_SUCCESS                       ERRINFO_SUCCESS
-#define FREERDP_ERROR_NONE							ERRINFO_NONE
+#define FREERDP_ERROR_SUCCESS						ERRINFO_SUCCESS
+#define FREERDP_ERROR_NONE						ERRINFO_NONE
 
 /* Error Info Codes */
 
-#define FREERDP_ERROR_ERRINFO_CLASS							(FREERDP_ERROR_BASE + 1)
+#define FREERDP_ERROR_ERRINFO_CLASS					(FREERDP_ERROR_BASE + 1)
 
-#define FREERDP_ERROR_RPC_INITIATED_DISCONNECT              MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_RPC_INITIATED_DISCONNECT)
-#define FREERDP_ERROR_RPC_INITIATED_LOGOFF					MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_RPC_INITIATED_LOGOFF)
-#define FREERDP_ERROR_IDLE_TIMEOUT							MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_IDLE_TIMEOUT)
-#define FREERDP_ERROR_LOGON_TIMEOUT							MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_LOGON_TIMEOUT)
-#define FREERDP_ERROR_DISCONNECTED_BY_OTHER_CONNECTION      MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_DISCONNECTED_BY_OTHER_CONNECTION)
-#define FREERDP_ERROR_OUT_OF_MEMORY							MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_OUT_OF_MEMORY)
-#define FREERDP_ERROR_SERVER_DENIED_CONNECTION              MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_SERVER_DENIED_CONNECTION)
-#define FREERDP_ERROR_SERVER_INSUFFICIENT_PRIVILEGES        MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_SERVER_INSUFFICIENT_PRIVILEGES)
-#define FREERDP_ERROR_SERVER_FRESH_CREDENTIALS_REQUIRED     MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_SERVER_FRESH_CREDENTIALS_REQUIRED)
-#define FREERDP_ERROR_RPC_INITIATED_DISCONNECT_BY_USER      MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_RPC_INITIATED_DISCONNECT_BY_USER)
-#define FREERDP_ERROR_LOGOFF_BY_USER						MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_LOGOFF_BY_USER)
+#define FREERDP_ERROR_RPC_INITIATED_DISCONNECT				MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_RPC_INITIATED_DISCONNECT)
+#define FREERDP_ERROR_RPC_INITIATED_LOGOFF				MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_RPC_INITIATED_LOGOFF)
+#define FREERDP_ERROR_IDLE_TIMEOUT					MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_IDLE_TIMEOUT)
+#define FREERDP_ERROR_LOGON_TIMEOUT					MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_LOGON_TIMEOUT)
+#define FREERDP_ERROR_DISCONNECTED_BY_OTHER_CONNECTION			MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_DISCONNECTED_BY_OTHER_CONNECTION)
+#define FREERDP_ERROR_OUT_OF_MEMORY					MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_OUT_OF_MEMORY)
+#define FREERDP_ERROR_SERVER_DENIED_CONNECTION				MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_SERVER_DENIED_CONNECTION)
+#define FREERDP_ERROR_SERVER_INSUFFICIENT_PRIVILEGES			MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_SERVER_INSUFFICIENT_PRIVILEGES)
+#define FREERDP_ERROR_SERVER_FRESH_CREDENTIALS_REQUIRED			MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_SERVER_FRESH_CREDENTIALS_REQUIRED)
+#define FREERDP_ERROR_RPC_INITIATED_DISCONNECT_BY_USER			MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_RPC_INITIATED_DISCONNECT_BY_USER)
+#define FREERDP_ERROR_LOGOFF_BY_USER					MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_LOGOFF_BY_USER)
 
 /* Connection Error Codes */
 
-#define FREERDP_ERROR_CONNECT_CLASS							(FREERDP_ERROR_BASE + 2)
+#define FREERDP_ERROR_CONNECT_CLASS					(FREERDP_ERROR_BASE + 2)
+
+#define FREERDP_ERROR_PRE_CONNECT_FAILED				MAKE_FREERDP_ERROR(CONNECT, 1)
+#define FREERDP_ERROR_CONNECT_UNDEFINED					MAKE_FREERDP_ERROR(CONNECT, 2)
+#define FREERDP_ERROR_POST_CONNECT_FAILED				MAKE_FREERDP_ERROR(CONNECT, 3)
+#define FREERDP_ERROR_DNS_ERROR						MAKE_FREERDP_ERROR(CONNECT, 4)
+#define FREERDP_ERROR_DNS_NAME_NOT_FOUND				MAKE_FREERDP_ERROR(CONNECT, 5)
+#define FREERDP_ERROR_CONNECT_FAILED					MAKE_FREERDP_ERROR(CONNECT, 6)
+#define FREERDP_ERROR_MCS_CONNECT_INITIAL_ERROR				MAKE_FREERDP_ERROR(CONNECT, 7)
+#define FREERDP_ERROR_TLS_CONNECT_FAILED				MAKE_FREERDP_ERROR(CONNECT, 8)
+#define FREERDP_ERROR_AUTHENTICATION_FAILED				MAKE_FREERDP_ERROR(CONNECT, 9)
+#define FREERDP_ERROR_INSUFFICIENT_PRIVILEGES				MAKE_FREERDP_ERROR(CONNECT, 10)
+#define FREERDP_ERROR_CONNECT_CANCELLED					MAKE_FREERDP_ERROR(CONNECT, 11)
 
-#define FREERDP_ERROR_PRE_CONNECT_FAILED					MAKE_FREERDP_ERROR(CONNECT, 1)
-#define FREERDP_ERROR_CONNECT_UNDEFINED						MAKE_FREERDP_ERROR(CONNECT, 2)
-#define FREERDP_ERROR_POST_CONNECT_FAILED					MAKE_FREERDP_ERROR(CONNECT, 3)
-#define FREERDP_ERROR_DNS_ERROR								MAKE_FREERDP_ERROR(CONNECT, 4)
-#define FREERDP_ERROR_DNS_NAME_NOT_FOUND					MAKE_FREERDP_ERROR(CONNECT, 5)
-#define FREERDP_ERROR_CONNECT_FAILED						MAKE_FREERDP_ERROR(CONNECT, 6)
-#define FREERDP_ERROR_MCS_CONNECT_INITIAL_ERROR             MAKE_FREERDP_ERROR(CONNECT, 7)
-#define FREERDP_ERROR_TLS_CONNECT_FAILED					MAKE_FREERDP_ERROR(CONNECT, 8)
-#define FREERDP_ERROR_AUTHENTICATION_FAILED					MAKE_FREERDP_ERROR(CONNECT, 9)
-#define FREERDP_ERROR_INSUFFICIENT_PRIVILEGES               MAKE_FREERDP_ERROR(CONNECT, 10)
-#define FREERDP_ERROR_CONNECT_CANCELLED						MAKE_FREERDP_ERROR(CONNECT, 11)
 #ifdef	__cplusplus
 }
 #endif
diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c
index f6974802d..5fc0977ed 100644
--- a/libfreerdp/core/freerdp.c
+++ b/libfreerdp/core/freerdp.c
@@ -189,7 +189,6 @@ BOOL freerdp_connect(freerdp* instance)
 	if (rdp->errorInfo == ERRINFO_SERVER_INSUFFICIENT_PRIVILEGES)
 	{
 		connectErrorCode = INSUFFICIENTPRIVILEGESERROR;
-
 		freerdp_set_last_error(instance->context, FREERDP_ERROR_INSUFFICIENT_PRIVILEGES);
 	}
 
@@ -198,16 +197,6 @@ BOOL freerdp_connect(freerdp* instance)
 		connectErrorCode = UNDEFINEDCONNECTERROR;
 	}
 
-	if (!freerdp_get_last_error(rdp->context))
-	{
-		freerdp_set_last_error(instance->context, FREERDP_ERROR_CONNECT_UNDEFINED);
-	}
-
-	if (!freerdp_get_last_error(rdp->context))
-	{
-		freerdp_set_last_error(instance->context, FREERDP_ERROR_CONNECT_UNDEFINED);
-	}
-
 	SetEvent(rdp->transport->connectedEvent);
 
 	freerdp_connect_finally:
@@ -489,6 +478,19 @@ UINT32 freerdp_error_info(freerdp* instance)
 	return instance->context->rdp->errorInfo;
 }
 
+UINT32 freerdp_get_last_error(rdpContext* context)
+{
+	return context->LastError;
+}
+
+void freerdp_set_last_error(rdpContext* context, UINT32 lastError)
+{
+	if (lastError)
+		fprintf(stderr, "freerdp_set_last_error 0x%04X\n", lastError);
+
+	context->LastError = lastError;
+}
+
 /** Allocator function for the rdp_freerdp structure.
  *  @return an allocated structure filled with 0s. Need to be deallocated using freerdp_free()
  */
@@ -520,14 +522,3 @@ void freerdp_free(freerdp* instance)
 		free(instance);
 	}
 }
-
-FREERDP_API UINT32 freerdp_get_last_error(rdpContext* context)
-{
-	return context->LastError;
-}
-
-FREERDP_API void freerdp_set_last_error(rdpContext* context, UINT32 lastError)
-{
-	fprintf(stderr, "freerdp_set_last_error 0x%x\n", lastError);
-	context->LastError = lastError;
-}