diff --git a/auth_token/client/authmsg.c b/auth_token/client/authmsg.c
index 4e636065..96329276 100644
--- a/auth_token/client/authmsg.c
+++ b/auth_token/client/authmsg.c
@@ -403,9 +403,8 @@ AuthRespCharDataHandler(
 {
    DbgTrace(2, "-AuthRespCharDataHandler- Start\n", 0);
 
-   // Just exit if being called to process LF and CR characters
-   if (len == 1
-       && ((*s == '\n') || (*s == '\r')))
+   // Just exit if being called to process white space
+   if (*s == '\n' || *s == '\r' || *s == '\t' || *s == ' ')
    {
       goto exit;
    }
diff --git a/auth_token/client/authpolicy.c b/auth_token/client/authpolicy.c
index 4c4ee41d..b69ce2b0 100644
--- a/auth_token/client/authpolicy.c
+++ b/auth_token/client/authpolicy.c
@@ -310,9 +310,8 @@ AuthPolicyCharDataHandler(
 
    DbgTrace(2, "-AuthPolicyCharDataHandler- Start\n", 0);
 
-   // Just exit if being called to process LF and CR characters
-   if (len == 1
-       && ((*s == '\n') || (*s == '\r')))
+   // Just exit if being called to process white space
+   if (*s == '\n' || *s == '\r' || *s == '\t' || *s == ' ')
    {
       goto exit;
    }
diff --git a/auth_token/client/getpolicymsg.c b/auth_token/client/getpolicymsg.c
index 67137ad6..5b568cc8 100644
--- a/auth_token/client/getpolicymsg.c
+++ b/auth_token/client/getpolicymsg.c
@@ -369,9 +369,8 @@ GetAuthPolicyRespCharDataHandler(
 {
    DbgTrace(2, "-GetAuthPolicyRespCharDataHandler- Start\n", 0);
 
-   // Just exit if being called to process LF and CR characters
-   if (len == 1
-       && ((*s == '\n') || (*s == '\r')))
+   // Just exit if being called to process white space
+   if (*s == '\n' || *s == '\r' || *s == '\t' || *s == ' ')
    {
       goto exit;
    }
diff --git a/auth_token/client/gettokenmsg.c b/auth_token/client/gettokenmsg.c
index 18da53b6..e25a7218 100644
--- a/auth_token/client/gettokenmsg.c
+++ b/auth_token/client/gettokenmsg.c
@@ -400,9 +400,8 @@ GetAuthTokenRespCharDataHandler(
 {
    DbgTrace(2, "-GetAuthTokenRespCharDataHandler- Start\n", 0);
 
-   // Just exit if being called to process LF and CR characters
-   if (len == 1
-       && ((*s == '\n') || (*s == '\r')))
+   // Just exit if being called to process white space
+   if (*s == '\n' || *s == '\r' || *s == '\t' || *s == ' ')
    {
       goto exit;
    }