Slightly renamed wait method, and added metric validation.