Added secondary address checking and exception