diff --git a/tools/migratedb/import_redis.py b/tools/migratedb/import_redis.py
index ab587d6..45a6eeb 100644
--- a/tools/migratedb/import_redis.py
+++ b/tools/migratedb/import_redis.py
@@ -12,11 +12,12 @@ import pprint
 argv = sys.argv
 host = argv[1]
 port = argv[2]
-script_name = argv[3]
+passwd = argv[3]
+script_name = argv[4]
 
 def writeToRedis(conn, cmdline):
     assert len(cmdline) > 1
-#    print(cmdline)
+    print(cmdline)
     if cmdline[0] == 'hset':
         conn.hset(cmdline[1], cmdline[2], cmdline[3])
     elif cmdline[0] == 'zadd':
@@ -24,14 +25,19 @@ def writeToRedis(conn, cmdline):
     elif cmdline[0] == 'sadd':
         conn.sadd(cmdline[1], cmdline[2])
     elif cmdline[0] == 'set':
-        conn.set(cmdline[1], cmdline[2])
+        if cmdline[2] != None:
+            conn.set(cmdline[1], cmdline[2])
+        else:
+            print('[warning]', cmdline)
     elif cmdline[0] == 'expire':
-        conn.expire(cmdline[1], cmdline[2])
+        if int(cmdline[2]) >= 0:
+            conn.expire(cmdline[1], cmdline[2])
     else:
         assert False
 
 conn = redis.Redis(host = host,
                    port = port,
+                   password = passwd,
                    db = 0,
                    decode_responses = True
 )