diff --git a/.env.example b/.env.example
index 7f29f2b..e69de29 100644
--- a/.env.example
+++ b/.env.example
@@ -1,2 +0,0 @@
-PHAXIO_API_KEY=
-PHAXIO_API_SECRET=
diff --git a/lib/phax_machine_sinatra/phax_machine_sinatra.rb b/lib/phax_machine_sinatra/phax_machine_sinatra.rb
index 3646288..58bd455 100644
--- a/lib/phax_machine_sinatra/phax_machine_sinatra.rb
+++ b/lib/phax_machine_sinatra/phax_machine_sinatra.rb
@@ -119,21 +119,33 @@ class PhaxMachineSinatra < Sinatra::Application
     end
 
     fax_from = @fax['from_number']
-    fax_file_name = params['filename']['filename']
-    fax_file_contents = params['filename']['tempfile'].read
-    email_subject = "Fax received from #{fax_from}"
 
-    Pony.mail(
+    if @fax['status'] == "success"
+    	email_subject = "Fax received from #{fax_from}"
+    else
+    	logger.info "#{recipient_number} received a fax with a failure status from #{fax_from} with no attachment"
+    	@fax['most_common_error'] = @fax['error_code']
+    	email_subject =	"Your fax failed because: #{@fax["most_common_error"]}"
+    end
+
+    pony_options = {
       to: email_addresses,
       from: smtp_from_address,
       subject: email_subject,
       html_body: erb(:fax_email, layout: false),
-      attachments: {
-        fax_file_name => fax_file_contents
-      },
       via: :smtp,
       via_options: smtp_options
-    )
+    }
+
+    # The Pony gem will attempt to run gsub() on the attachment at some point, so I've moved the options out
+    # of the method arguments and placed them above. This shuffling prevents errors if a user has no attachment
+    if params['filename']
+    	fax_file_name = params['filename']['filename']
+   		fax_file_contents = params['filename']['tempfile'].read
+   		pony_options[:attachments] = { fax_file_name => fax_file_contents }
+   	end
+
+    Pony.mail(pony_options)
   end
 
   post '/fax_sent' do
diff --git a/lib/phax_machine_sinatra/views/fax_email.erb b/lib/phax_machine_sinatra/views/fax_email.erb
index b7aac66..1ee8adc 100644
--- a/lib/phax_machine_sinatra/views/fax_email.erb
+++ b/lib/phax_machine_sinatra/views/fax_email.erb
@@ -1,5 +1,9 @@
 <% if @fax["direction"] == "received" %>
-  <h1>You've received a new fax!</h1>
+	<% if @fax['status'] == "success" %>
+  	<h1>You've received a new fax!</h1>
+  <% else %>
+  	<h1><%= @fax['from_number'] %> attempted to fax you.</h1>
+  <% end %>
 <% else %>
 	<% if @fax["status"] == "success" %>
   	<h1>Your fax was sent successfully</h1>
@@ -20,7 +24,9 @@
 <% end %>
 
 <% if @fax["direction"] == "received" %>
-  <p>The document has been attached to this email.</p>
+	<% if @fax["status"] == "success" %>
+  	<p>The document has been attached to this email.</p>
+  <% end %>
 <% else %>
   <h2>Recipients</h2>
   <% @fax["recipients"].each do |recipient| %>