Add relaxed shell returns checks