diff --git a/yomi_base/reader.py b/yomi_base/reader.py
index 48e513b..522c1d5 100644
--- a/yomi_base/reader.py
+++ b/yomi_base/reader.py
@@ -273,7 +273,8 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader):
 
     def onActionToggleWrap(self, wrap):
         self.preferences['wordWrap'] = wrap
-        self.textContent.setLineWrapMode(QtGui.QPlainTextEdit.WidgetWidth if self.preferences['wordWrap'] else QtGui.QPlainTextEdit.NoWrap)
+        mode = QtGui.QPlainTextEdit.WidgetWidth if self.preferences['wordWrap'] else QtGui.QPlainTextEdit.NoWrap
+        self.textContent.setLineWrapMode(mode)
 
 
     def onActionHomepage(self):
@@ -559,10 +560,10 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader):
         if options.get('trim', True):
             defs = defs[:self.preferences['maxResults']]
 
-        html = builder(defs, self.ankiIsFactValid)
-
         scrollbar = control.verticalScrollBar()
         position  = scrollbar.sliderPosition()
+
+        html = builder(defs, self.ankiIsFactValid)
         control.setHtml(html)
 
         if options.get('scroll', False):
diff --git a/yomi_base/remote_api.py b/yomi_base/remote_api.py
index 3718000..089ed2a 100644
--- a/yomi_base/remote_api.py
+++ b/yomi_base/remote_api.py
@@ -87,7 +87,10 @@ class RemoteApi:
 
 
     def handler(self, request):
-        self.handlers.get(request.get('action'), self.apiInvalidRequest)(request.get('data'))
+        action = request.get('action')
+        data   = request.get('data')
+
+        self.handlers.get(action, self.apiInvalidRequest)(data)
 
 
     def apiAddNote(self, data):
@@ -107,4 +110,4 @@ class RemoteApi:
 
 
     def apiInvalidRequest(self, data):
-        return {}
+        return None