Working on #398. Added check for catch all project.