WIP error recovery + fixed NPE