Merge "Don't WTF when assist structure is missing." into oc-dev