Added address checking.