improved Adress/Station type check