more rror handling improvements