diff --git a/phpinspect-resolvecontext.el b/phpinspect-resolvecontext.el
index 9128132..2a95575 100644
--- a/phpinspect-resolvecontext.el
+++ b/phpinspect-resolvecontext.el
@@ -79,7 +79,8 @@
                 (throw 'return (phpinspect-find-statement-before-point bmap child point)))
             (when (phpinspect-statement-introduction-p token)
               (throw 'return previous-siblings))
-            (push child previous-siblings)))))
+            (unless (phpinspect-comment-p token)
+              (push child previous-siblings))))))
     previous-siblings))
 
 (defun phpinspect--get-last-statement-in-token (token)
diff --git a/phpinspect-worker.el b/phpinspect-worker.el
index 0a3e112..60977c0 100644
--- a/phpinspect-worker.el
+++ b/phpinspect-worker.el
@@ -152,6 +152,7 @@ already present in the queue."
                           (phpinspect-worker-skip-next-pause worker))
                 (phpinspect-thread-pause phpinspect-worker-pause-time mx continue))
               (setf (phpinspect-worker-skip-next-pause worker) nil)))
+        ((debug error) (thread-signal main-thread 'phpinspect-worker-error err))
         (t (phpinspect--log "Phpinspect worker thread errored :%s" err))))
     (phpinspect--log "Worker thread exiting")
     (message "phpinspect worker thread exited")))