Some improvement on error handling and reset for watch position