I feel both of these conditions *shouldn't* be necessary, but the existing tests would fail without the status == None check. Maybe I missed something...