lib/graphql/relay/array_connection.rb in graphql-1.3.0 vs lib/graphql/relay/array_connection.rb in graphql-1.4.0

@@ -30,19 +30,21 @@
         end
       end
 
       # Apply cursors to edges
       def sliced_nodes
-        @sliced_nodes ||= nodes[starting_offset..-1]
+        @sliced_nodes ||= nodes[starting_offset..-1] || []
       end
 
       def index_from_cursor(cursor)
         decode(cursor).to_i
       end
 
       def starting_offset
         @starting_offset = if before
           [previous_offset, 0].max
+        elsif last
+          nodes.count - last
         else
           previous_offset
         end
       end