improved registration error handling, removed logging, etc.