Merge "Make wake() error fatal"