More generic handling of status