Add more logging around failed watches