Address Code review comments and improved exception handling in
process_router() and _router_removed()

Change-Id: Ibed76e2445f3468ef2a90a6d568bfa299622831e