Fix registration and add more verbose return (in select cases)