Fix NPE
Merge branch 'master' of github.com:dma-enav/EPD