Revert the NPE protection (it was missing FMP)