I think it makes sense to keep both specific catches returning "no such element" but I'll add a third one that will catch-all to address what you've said.