diff --git a/db_transfer.py b/db_transfer.py
index 0f3a7c9..2f10870 100644
--- a/db_transfer.py
+++ b/db_transfer.py
@@ -550,8 +550,8 @@ class Dbv3Transfer(DbTransfer):
 
 		cur = conn.cursor()
 		try:
-			cur.execute("SELECT " + ','.join(keys) + " FROM user")
 			rows = []
+			cur.execute("SELECT " + ','.join(keys) + " FROM user")
 			for r in cur.fetchall():
 				d = {}
 				for column in range(len(keys)):
diff --git a/shadowsocks/asyncdns.py b/shadowsocks/asyncdns.py
index 3f92e62..01f2522 100644
--- a/shadowsocks/asyncdns.py
+++ b/shadowsocks/asyncdns.py
@@ -331,6 +331,8 @@ class DNSResolver(object):
             with open(etc_path, 'rb') as f:
                 for line in f.readlines():
                     line = line.strip()
+                    if "#" in line:
+                        line = line[:line.find('#')]
                     parts = line.split()
                     if len(parts) >= 2:
                         ip = parts[0]