Add timeout to verify handlers