diff --git a/iphone/Maps/Bookmarks/AddSetVC.mm b/iphone/Maps/Bookmarks/AddSetVC.mm
index 96490429fc..e6a9102c6d 100644
--- a/iphone/Maps/Bookmarks/AddSetVC.mm
+++ b/iphone/Maps/Bookmarks/AddSetVC.mm
@@ -24,7 +24,8 @@
   if (text.length)
   {
     m_balloon.setName = text;
-    GetFramework().GetBmCategory([text UTF8String]);
+    // Create category if it doesn't exist
+    (void)GetFramework().GetBmCategory([text UTF8String]);
     
     // Display "Add Bookmark" dialog
     NSArray * vcs = self.navigationController.viewControllers;
diff --git a/iphone/Maps/Bookmarks/SelectSetVC.mm b/iphone/Maps/Bookmarks/SelectSetVC.mm
index 6c83834ad7..904f75de38 100644
--- a/iphone/Maps/Bookmarks/SelectSetVC.mm
+++ b/iphone/Maps/Bookmarks/SelectSetVC.mm
@@ -129,9 +129,9 @@
       if (cat && cat->GetName() == [m_balloon.setName UTF8String])
         moveCheckMark = true;
 
-      if (GetFramework().DeleteBmCategory(indexPath.row))
+      if (f.DeleteBmCategory(indexPath.row))
         [self.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
-      if (GetFramework().GetBmCategoriesCount() == 1)
+      if (f.GetBmCategoriesCount() == 1)
       {
         // Disable edit mode to leave at least one bookmarks category
         [self setEditing:NO animated:YES];