Fix last NULL value issue 2
Add UNEP report to wish list 4