Added failure message for wakeup handler
Refactoring