ENH: Catch registration failures and raise an exception

Also cleanup some old code and check that inputs have the correct type