Change our status check from isset to empty