Fix Eco take bug and fix NPE