diff --git a/lib/zenpush.rb b/lib/zenpush.rb
index 7b8a9bf..7c60ca0 100644
--- a/lib/zenpush.rb
+++ b/lib/zenpush.rb
@@ -11,7 +11,7 @@ def z
     @z ||= ZenPush::Zendesk.new
   end
 
-  # 
+  #
   def file_to_category_forum_entry(file)
     absolute_path = File.realpath(file)
     parts = absolute_path.split('/')
diff --git a/lib/zenpush/zendesk.rb b/lib/zenpush/zendesk.rb
index 3791488..3e45454 100644
--- a/lib/zenpush/zendesk.rb
+++ b/lib/zenpush/zendesk.rb
@@ -10,12 +10,15 @@ class Zendesk
     headers 'Content-Type' => 'application/json'
     # debug_output
 
+    attr_reader :mode
+
     def initialize(b = nil, u = nil, p = nil)
       if b.nil? || u.nil? || p.nil?
         creds = YAML.load_file(File.join(ENV['HOME'], '.zenpush.yml'))
         b ||= creds['uri']
         u ||= creds['user']
         p ||= creds['password']
+        @mode = creds['mode']
       end
 
       self.class.base_uri b + '/api/v1'
@@ -68,13 +71,14 @@ def entry(entry_id, options = {})
 
     # Find category by name
     def find_category(category_name, options = {})
+      return nil if mode == 'starter'
       self.categories.detect {|c| c['name'] == category_name}
     end
 
     # Find forum by name, knowing the category name
     def find_forum(category_name, forum_name, options = {})
       category = self.find_category(category_name, options)
-      if category
+      if category || mode == 'starter'
         self.forums.detect {|f| f['name'] == forum_name}
       end
     end