broader exception coverage