Check empty source when adding claim

fix the rspec cases and add checking for the source when adding claim
great inline comments!