just clarifying a few exception cases and some logging information