Fixes a silly hangup bug on a bad registration request.
Merge branch 'master' into dev