Tweak to not throw exception if the current list is empty