cleaning up a bit, adding error for when the collection doesn't exist