Better conditional for checking status