Fixed an NPE and added basic economy support.