diff --git a/parl/remote/remote_decorator.py b/parl/remote/remote_decorator.py
index f4a498bf0169d1322f5a76c6b8b0978c8f61546e..a066abc40832fdce00fd00d1784aa75c60925e00 100644
--- a/parl/remote/remote_decorator.py
+++ b/parl/remote/remote_decorator.py
@@ -152,6 +152,8 @@ def remote_class(*args, **kwargs):
                         pass
                     except zmq.error.ZMQError:
                         pass
+                    except TypeError:
+                        pass
 
             def send_file(self, socket):
                 try:
diff --git a/parl/remote/tests/log_server_test.py b/parl/remote/tests/log_server_test.py
index b8a8c37a6164cbe5c045bd34b205e06d954166e1..6b6aad4eebada68748e38ae1b37131af9f60b28e 100644
--- a/parl/remote/tests/log_server_test.py
+++ b/parl/remote/tests/log_server_test.py
@@ -100,13 +100,15 @@ class TestLogServer(unittest.TestCase):
             self.assertEqual(r.status_code, 200)
             log_content = json.loads(r.text).get('log')
             self.assertIsNotNone(log_content)
+            log_content = log_content.replace('\r\n', '\n')
             self.assertIn(log_content, outputs)
 
             # Test download
             download_url = "http://{}/download-log".format(log_server_addr)
             r = requests.get(download_url, params={'job_id': job_id})
             self.assertEqual(r.status_code, 200)
-            self.assertIn(r.text, outputs)
+            log_content = r.text.replace('\r\n', '\n')
+            self.assertIn(log_content, outputs)
 
         disconnect()
         worker.exit()
@@ -121,10 +123,10 @@ class TestLogServer(unittest.TestCase):
         th.start()
         time.sleep(1)
         # start the cluster monitor
-        monitor_file = __file__.replace('tests/log_server_test.pyc',
-                                        'monitor.py')
-        monitor_file = monitor_file.replace('tests/log_server_test.py',
-                                            'monitor.py')
+        monitor_file = __file__.replace(
+            os.path.join('tests', 'log_server_test.pyc'), 'monitor.py')
+        monitor_file = monitor_file.replace(
+            os.path.join('tests', 'log_server_test.py'), 'monitor.py')
         command = [
             sys.executable, monitor_file, "--monitor_port",
             str(monitor_port), "--address", "localhost:" + str(master_port)
@@ -160,13 +162,15 @@ class TestLogServer(unittest.TestCase):
             self.assertEqual(r.status_code, 200)
             log_content = json.loads(r.text).get('log')
             self.assertIsNotNone(log_content)
+            log_content = log_content.replace('\r\n', '\n')
             self.assertIn(log_content, outputs)
 
             # Test download
             download_url = job.get('download_url')
             r = requests.get(download_url)
             self.assertEqual(r.status_code, 200)
-            self.assertIn(r.text, outputs)
+            log_content = r.text.replace('\r\n', '\n')
+            self.assertIn(log_content, outputs)
 
         # Clean context
         monitor_proc.kill()