HouseKeeping: Moves addr check back to main.go