We need to do a once-over of the registry library and clean all of the error handling up. This is one of the things to address.