Improve handling and fault tolerance of additional project types.