Add check for project ID

Continuation of !137 (merged)

Fixes a small bug in join statement and add the check. Please check and merge to feature/122-projects