diff --git a/lib/jam_ruby.rb b/lib/jam_ruby.rb
index 19e638c35..a7aafe72c 100755
--- a/lib/jam_ruby.rb
+++ b/lib/jam_ruby.rb
@@ -71,6 +71,7 @@ require "jam_ruby/models/recording"
 require "jam_ruby/models/recorded_track"
 require "jam_ruby/models/mix"
 require "jam_ruby/models/claimed_recording"
+require "jam_ruby/models/crash_dump"
 
 include Jampb
 
diff --git a/lib/jam_ruby/lib/profanity.rb b/lib/jam_ruby/lib/profanity.rb
index 4203f839d..6caaead09 100644
--- a/lib/jam_ruby/lib/profanity.rb
+++ b/lib/jam_ruby/lib/profanity.rb
@@ -5,7 +5,12 @@ module JamRuby
     @@dictionary = nil
 
     def self.dictionary
-      @@dictionary ||= YAML.load_file(@@dictionary_file)
+      if File.exists? @@dictionary_file
+        @@dictionary ||= YAML.load_file(@@dictionary_file)
+      else
+        @@dictionary = []
+      end
+      @@dictionary 
     end
 
     def self.check_word(word)
diff --git a/lib/jam_ruby/models/crash_dump.rb b/lib/jam_ruby/models/crash_dump.rb
new file mode 100644
index 000000000..fc60e49e9
--- /dev/null
+++ b/lib/jam_ruby/models/crash_dump.rb
@@ -0,0 +1,10 @@
+module JamRuby
+  class CrashDump < ActiveRecord::Base
+
+    self.table_name = "crash_dumps"
+
+    self.primary_key = 'id'
+    
+    validates :client_type, presence: true
+  end
+end
diff --git a/spec/jam_ruby/models/crash_dump_spec.rb b/spec/jam_ruby/models/crash_dump_spec.rb
new file mode 100644
index 000000000..fa253c6f3
--- /dev/null
+++ b/spec/jam_ruby/models/crash_dump_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe CrashDump do
+  before do
+  end
+
+  it "should fail to save a crash dump without a client_type" do
+    CrashDump.new(:client_type => "").should_not be_valid
+  end
+
+  it "should be able to save a crash dump with JUST a client_type" do
+    @cd = CrashDump.new
+    @cd.client_type = "Win32"
+    @cd.should be_valid
+    @cd.save
+
+    CrashDump.first.id.should == @cd.id
+  end
+end