Fixed module order, fixed npe