diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index e00faaadc4..c132a09bc9 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -586,7 +586,7 @@ class BaseDocument(object):
 				self.set(df.fieldname, '*'*len(new_password))
 
 	def get_password(self, fieldname='password', raise_exception=True):
-		if not self.is_dummy_password(self.get(fieldname)):
+		if self.get(fieldname) and not self.is_dummy_password(self.get(fieldname)):
 			return self.get(fieldname)
 
 		return get_decrypted_password(self.doctype, self.name, fieldname, raise_exception=raise_exception)