Enhance error handling for router interface handling.

Change-Id: I33a9aad2ece1cf338e87bda1d5f67eb9354a5252