Check name AND holder.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Remove debug.
Signed-off-by: Chris Sanders <zidane@outlook.com>