same comment: would be nice to move inside the catch