IDEA-122452 - Make fails on Error: java.lang.NullPointerException since 13.1
(cherry picked from commit 6a8ab58) [r=Nikolay.Chashnikov]