[squash] Handle not_found