Fix potential null exception on TCP requests
Merge pull request #15 from jccyr01/fix_null_exception

Fix potential null exception on TCP requests