Make a better error message if the entry doesn't exist
Merge remote-tracking branch 'origin/master'