Replace expect with a safer alternative that returns None instead

Replace expect with a safer alternative that returns None instead #215