diff --git a/README.md b/README.md
index 19ea301c..713a1779 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Decentralized websites using Bitcoin crypto and the BitTorrent network - http://
 * When you visit a new zeronet site, it tries to find peers using the BitTorrent
   network so it can download the site files (html, css, js...) from them.
 * Each visited site becomes also served by you.
-* Every site contains a `site.json` which holds all other files in a sha512 hash
+* Every site contains a `content.json` which holds all other files in a sha512 hash
   and a signature generated using site's private key.
 * If the site owner (who has the private key for the site address) modifies the
   site, then he/she signs the new `content.json` and publishes it to the peers.
diff --git a/src/Config.py b/src/Config.py
index 4cd80350..cfd466a4 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -8,7 +8,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.3.3"
-        self.rev = 618
+        self.rev = 619
         self.argv = argv
         self.action = None
         self.createParser()
diff --git a/src/main.py b/src/main.py
index 88be7682..11847799 100644
--- a/src/main.py
+++ b/src/main.py
@@ -153,8 +153,11 @@ class Actions(object):
         if not privatekey:  # If no privatekey definied
             from User import UserManager
             user = UserManager.user_manager.get()
-            site_data = user.getSiteData(address)
-            privatekey = site_data.get("privatekey")
+            if user:
+                site_data = user.getSiteData(address)
+                privatekey = site_data.get("privatekey")
+            else:
+                privatekey = None
             if not privatekey:
                 # Not found in users.json, ask from console
                 import getpass