Refinements to closed state message handling