Roy|000|Throw BookmarkNotFoundException if bookmark to update does not exist

Renamed a method as well.
The changes are as per Frank's review comments.

Change-Id: I6660c32b96a05e840bdb48dcc2d2c0473875b873