Tighten up address validation

@Skablam one for you to have a look at