Merge "Protection against bookmarks with url=null in the database"