make getter more robust