lib/docman/info.rb in docman-0.0.36 vs lib/docman/info.rb in docman-0.0.37

@@ -20,10 +20,10 @@
         self['states'].each_pair do |name, state|
           if state.has_key?('source')
             if state['source']['type'] == :retrieve_from_repo
               repo = state['source']['repo'] == :project_repo ? self['repo'] : state['source']['repo']
               external_state_info = read_yaml_from_file(repo, self['states_path'], state['source']['branch'], state['source']['file'])
-              state.deep_merge! external_state_info unless external_state_info.nil?
+              state.deep_merge! external_state_info unless external_state_info.nil? or state.nil?
             end
           end
         end
       end
     end
\ No newline at end of file