diff --git a/lib/ceedling/file_path_collection_utils.rb b/lib/ceedling/file_path_collection_utils.rb
index 65fbeb253..1c01d3ee6 100644
--- a/lib/ceedling/file_path_collection_utils.rb
+++ b/lib/ceedling/file_path_collection_utils.rb
@@ -128,7 +128,7 @@ def shortest_path_from_working(path)
     begin
       # Reform path from full absolute to nice, neat relative path instead
       (Pathname.new( path ).relative_path_from( @working_dir_path )).to_s
-    rescue
+    rescue StandardError
       # If we can't form a relative path between these paths, use the absolute
       path 
     end
diff --git a/plugins/dependencies/lib/dependencies.rb b/plugins/dependencies/lib/dependencies.rb
index 790ecec4a..ae9538bfa 100644
--- a/plugins/dependencies/lib/dependencies.rb
+++ b/plugins/dependencies/lib/dependencies.rb
@@ -398,7 +398,7 @@ def build_lib(blob)
     build_path = Pathname.new get_build_path(blob)
     relative_build_path = begin
       build_path.relative_path_from(source_path)
-    rescue
+    rescue StandardError
       build_path 
     end
 
diff --git a/plugins/module_generator/lib/module_generator.rb b/plugins/module_generator/lib/module_generator.rb
index ffdabd081..b44447ec7 100755
--- a/plugins/module_generator/lib/module_generator.rb
+++ b/plugins/module_generator/lib/module_generator.rb
@@ -61,6 +61,9 @@ def divine_options(optz={})
       :naming       => ((defined? MODULE_GENERATOR_NAMING      ) ? MODULE_GENERATOR_NAMING : nil ),
       :update_svn   => ((defined? MODULE_GENERATOR_UPDATE_SVN  ) ? MODULE_GENERATOR_UPDATE_SVN : false ),
       :test_define  => ((defined? MODULE_GENERATOR_TEST_DEFINE ) ? MODULE_GENERATOR_TEST_DEFINE : "TEST" ),
+      :path_src     => ((defined? MODULE_GENERATOR_PATH_SRC    ) ? MODULE_GENERATOR_PATH_SRC : nil ),
+      :path_inc     => ((defined? MODULE_GENERATOR_PATH_INC    ) ? MODULE_GENERATOR_PATH_INC : nil ),
+      :path_tst     => ((defined? MODULE_GENERATOR_PATH_TST    ) ? MODULE_GENERATOR_PATH_TST : nil ),
     }
 
     # Add our lookup paths to this, based on overall project configuration
@@ -99,11 +102,12 @@ def divine_options(optz={})
 
     # Check if using "create[<module_root>:<module_name>]" optional paths from command line.
     if optz[:module_root_path].to_s.empty?
-      # No path specified. Use the first of each list because we have nothing else to base it on
-      unity_generator_options[:skeleton_path] = unity_generator_options[:paths_src][0]
-      unity_generator_options[:path_src] = unity_generator_options[:paths_src][0]
-      unity_generator_options[:path_inc] = unity_generator_options[:paths_inc][0]
-      unity_generator_options[:path_tst] = unity_generator_options[:paths_tst][0]
+      # No path specified. Use the one specified in the module generator section if it exists, 
+      # else the first of each list because we have nothing else to base it on
+      unity_generator_options[:skeleton_path] ||= unity_generator_options[:paths_src][0]
+      unity_generator_options[:path_src] ||= unity_generator_options[:paths_src][0]
+      unity_generator_options[:path_inc] ||= unity_generator_options[:paths_inc][0]
+      unity_generator_options[:path_tst] ||= unity_generator_options[:paths_tst][0]
     else
       # A path was specified. Do our best to determine which is the best choice based on this information
       unity_generator_options[:skeleton_path] = @ceedling[:file_finder_helper].find_best_path_in_collection(optz[:module_root_path], unity_generator_options[:paths_src], :ignore) || unity_generator_options[:paths_src][0]
diff --git a/vendor/cmock b/vendor/cmock
index 7d6ec0354..d5e938e4b 160000
--- a/vendor/cmock
+++ b/vendor/cmock
@@ -1 +1 @@
-Subproject commit 7d6ec0354a4087605ac865d5876f90f6fb9781ac
+Subproject commit d5e938e4b1ffc64acc70c7cf9b7ac6591f806c0b