Bug fix if project is null