Fix for #694 Unexpected error when user has many collections