Added some handling if project is empty