Updated assembly maven plugin and fixed NPE