BZ1036806 - NPE when creating new project
(cherry picked from commit f72843f4a79cafe2b46a2f3a890db06e2741f8e1)