preparing https://github.com/OCHA-DAP/DAP-System/issues/124
https://github.com/OCHA-DAP/DAP-System/issues/124
https://github.com/OCHA-DAP/DAP-System/issues/124
https://github.com/OCHA-DAP/DAP-System/issues/124
fixing a NPE