Added error handling for initial register startup
Merge pull request #1 from dnwick/master

Added error handling for initial register startup