diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index a63a810313..5e55dd0f9a 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -470,6 +470,8 @@ class Enterprise < ActiveRecord::Base
   end
 
   def initialize_permalink
+    return unless name
+
     self.permalink = Enterprise.find_available_permalink(name)
   end
 
diff --git a/spec/models/enterprise_spec.rb b/spec/models/enterprise_spec.rb
index b5dad386a5..e3f9ee9561 100644
--- a/spec/models/enterprise_spec.rb
+++ b/spec/models/enterprise_spec.rb
@@ -67,15 +67,17 @@ describe Enterprise do
       end
 
       it "scopes relatives to visible distributors" do
-        expect(e).to receive(:relatives_including_self).and_return(relatives = [])
+        enterprise = build_stubbed(:distributor_enterprise)
+        expect(enterprise).to receive(:relatives_including_self).and_return(relatives = [])
         expect(relatives).to receive(:is_distributor).and_return relatives
-        e.distributors
+        enterprise.distributors
       end
 
       it "scopes relatives to visible producers" do
-        expect(e).to receive(:relatives_including_self).and_return(relatives = [])
+        enterprise = build_stubbed(:distributor_enterprise)
+        expect(enterprise).to receive(:relatives_including_self).and_return(relatives = [])
         expect(relatives).to receive(:is_primary_producer).and_return relatives
-        e.suppliers
+        enterprise.suppliers
       end
     end
 
@@ -109,14 +111,16 @@ describe Enterprise do
   end
 
   describe "validations" do
-    subject { FactoryBot.create(:distributor_enterprise) }
     it { is_expected.to validate_presence_of(:name) }
-    it { is_expected.to validate_uniqueness_of(:permalink) }
+    it do
+      FactoryBot.create(:distributor_enterprise)
+      is_expected.to validate_uniqueness_of(:permalink)
+    end
 
     it "requires an owner" do
-      expect{
-        e = create(:enterprise, owner: nil)
-      }.to raise_error ActiveRecord::RecordInvalid, "Validation failed: Owner can't be blank"
+      enterprise = build_stubbed(:enterprise, owner: nil)
+      expect(enterprise).not_to be_valid
+      expect(enterprise.errors[:owner].first).to eq "can't be blank"
     end
 
     describe "name uniqueness" do
@@ -507,7 +511,7 @@ describe Enterprise do
 
   describe "presentation of attributes" do
     let(:distributor) {
-      create(:distributor_enterprise,
+      build_stubbed(:distributor_enterprise,
              website: "http://www.google.com",
              facebook: "www.facebook.com/roger",
              linkedin: "https://linkedin.com")
@@ -533,12 +537,12 @@ describe Enterprise do
   end
 
   describe "provide enterprise category" do
-    let(:producer_sell_all) { build(:enterprise, is_primary_producer: true,  sells: "any") }
-    let(:producer_sell_own) { build(:enterprise, is_primary_producer: true,  sells: "own") }
-    let(:producer_sell_none) { build(:enterprise, is_primary_producer: true, sells: "none") }
-    let(:non_producer_sell_all) { build(:enterprise, is_primary_producer: false,  sells: "any") }
-    let(:non_producer_sell_own) { build(:enterprise, is_primary_producer: false,  sells: "own") }
-    let(:non_producer_sell_none) { build(:enterprise, is_primary_producer: false, sells: "none") }
+    let(:producer_sell_all) { build_stubbed(:enterprise, is_primary_producer: true,  sells: "any") }
+    let(:producer_sell_own) { build_stubbed(:enterprise, is_primary_producer: true,  sells: "own") }
+    let(:producer_sell_none) { build_stubbed(:enterprise, is_primary_producer: true, sells: "none") }
+    let(:non_producer_sell_all) { build_stubbed(:enterprise, is_primary_producer: false,  sells: "any") }
+    let(:non_producer_sell_own) { build_stubbed(:enterprise, is_primary_producer: false,  sells: "own") }
+    let(:non_producer_sell_none) { build_stubbed(:enterprise, is_primary_producer: false, sells: "none") }
 
     it "should output enterprise categories" do
       expect(producer_sell_all.is_primary_producer).to eq(true)
@@ -554,7 +558,7 @@ describe Enterprise do
   end
 
   describe "finding and automatically assigning a permalink" do
-    let(:enterprise) { build(:enterprise, name: "Name To Turn Into A Permalink") }
+    let(:enterprise) { build_stubbed(:enterprise, name: "Name To Turn Into A Permalink") }
     it "assigns permalink when initialized" do
       allow(Enterprise).to receive(:find_available_permalink).and_return("available_permalink")
       expect(Enterprise).to receive(:find_available_permalink).with("Name To Turn Into A Permalink")