changes to avoid crashes when address not there
bug fixes