Add listener interface.  Handle null stops being returned from HashMap.