core.actions: avoid exception

2 files changed, 8 insertions, 3 deletions

diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index 88ee9d83..c87021bc 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -143,6 +143,10 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware):
 		self.move(to=2, pages=True)  # moves to page 2.
 		self.move(to=1, percentage=True)  # moves to 80%
 		"""
+		cwd = self.env.cwd
+		if not cwd or not cwd.accessible or not cwd.content_loaded:
+			return
+
 		direction = Direction(kw)
 		if 'left' in direction or direction.left() > 0:
 			steps = direction.left()
@@ -168,10 +172,10 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware):
 			newpos = direction.move(
 					direction=direction.down(),
 					override=narg,
-					maximum=len(self.env.cwd),
-					current=self.env.cwd.pointer,
+					maximum=len(cwd),
+					current=cwd.pointer,
 					pagesize=self.ui.browser.hei)
-			self.env.cwd.move(to=newpos)
+			cwd.move(to=newpos)
 
 	def history_go(self, relative):
 		"""Move back and forth in the history"""
diff --git a/ranger/fsobject/directory.py b/ranger/fsobject/directory.py
index 3574f329..c9ec5bf5 100644
--- a/ranger/fsobject/directory.py
+++ b/ranger/fsobject/directory.py
@@ -59,6 +59,7 @@ class Directory(FileSystemObject, Accumulator, SettingsAware):
 
 	order_outdated = False
 	content_outdated = False
+	content_loaded = False
 
 	sort_dict = {
 		'basename': sort_by_basename,