diff --git a/search_frame.lua b/search_frame.lua
index 33c33ec..a4e6a9e 100644
--- a/search_frame.lua
+++ b/search_frame.lua
@@ -857,10 +857,10 @@ function public.start_search(filter_string, resume)
             private.stop_button:Hide()
             private.search_button:Show()
 
-            for i=1,current_query-1 do
+            for i=1,(current_query or 1)-1 do
                 tremove(queries, 1)
             end
-            queries[current_query].start_page = current_page
+            queries[current_query].start_page = (current_page or 0)
             aborted_search = queries
             private.search_button:SetText('Cont.')
         end,