added some checks for null fields

homeBase still does not display your current home base as selected value
in select (if one is set)