Fix issue with locked method missing device handler