Got rid of the NPE.
Used liferay-aui-upgrade-tool:
https://github.com/PolitAktiv/liferay-aui-upgrade-tool.git