diff --git a/src/mcedit2/editorsession.py b/src/mcedit2/editorsession.py
index fa898fb..d5954bb 100644
--- a/src/mcedit2/editorsession.py
+++ b/src/mcedit2/editorsession.py
@@ -971,8 +971,14 @@ class EditorTab(QtGui.QWidget):
     def dimensionDidChange(self, dim):
         for view in self.views:
             view.setDimension(dim)
+        # EditorSession has a new loader now, so re-add minimap and current view
+
+        self.editorSession.loader.addClient(self.miniMap)
+        view = self.currentView()
+        if view is not None:
             self.editorSession.loader.addClient(view)
 
+
     def toolDidChange(self, tool):
         if tool.toolWidget:
             self.toolOptionsArea.takeWidget()  # setWidget gives ownership to the scroll area
@@ -1021,7 +1027,10 @@ class EditorTab(QtGui.QWidget):
 
         :rtype: mcedit2.worldview.worldview.WorldView
         """
-        return self.viewStack.currentWidget().worldView
+        widget = self.viewStack.currentWidget()
+        if widget is None:
+            return None
+        return widget.worldView
 
     def showViewFrame(self, frame):
         center = self.currentView().viewCenter()
diff --git a/src/mcedit2/worldview/worldview.py b/src/mcedit2/worldview/worldview.py
index 6ec7701..e8782fc 100644
--- a/src/mcedit2/worldview/worldview.py
+++ b/src/mcedit2/worldview/worldview.py
@@ -194,8 +194,6 @@ class WorldView(QGLWidget):
         self.matrixNode = scenegraph.MatrixNode()
         self._updateMatrices()
 
-
-
         self.matrixNode.addChild(self.loadableChunksNode)
         self.matrixNode.addChild(self.worldScene)
         self.matrixNode.addChild(self.overlayNode)
diff --git a/src/mceditlib/worldeditor.py b/src/mceditlib/worldeditor.py
index 9aeb212..eb4aa4a 100644
--- a/src/mceditlib/worldeditor.py
+++ b/src/mceditlib/worldeditor.py
@@ -423,8 +423,7 @@ class WorldEditor(object):
             log.info("Dim %s: Found %d chunks in %0.2f seconds.",
                      dimName,
                      len(chunkPositions),
-                     time.time() -
-                     start)
+                     time.time() - start)
             self._allChunks[dimName] = chunkPositions
 
     def chunkCount(self, dimName):