Fix Economy Support and fix Break-Bug (Nullpointer)