Added better handling for failed registration calls