diff --git a/src/main/java/jenkins/plugins/hipchat/ActiveNotifier.java b/src/main/java/jenkins/plugins/hipchat/ActiveNotifier.java
index 6576ec3..1818cfc 100644
--- a/src/main/java/jenkins/plugins/hipchat/ActiveNotifier.java
+++ b/src/main/java/jenkins/plugins/hipchat/ActiveNotifier.java
@@ -68,7 +68,7 @@ public void completed(AbstractBuild r) {
                 || (result == Result.SUCCESS && previousResult == Result.FAILURE && jobProperty.getNotifyBackToNormal())
                 || (result == Result.SUCCESS && jobProperty.getNotifySuccess())
                 || (result == Result.UNSTABLE && jobProperty.getNotifyUnstable())) {
-            getHipChat(r).publish(getBuildStatusMessage(r), getBuildColor(r));
+            getHipChat(r).publish(getBuildStatusMessage(r), getBuildColor(r), jobProperty.getAlwaysShowNotification());
         }
     }
 
@@ -84,7 +84,12 @@ String getChanges(AbstractBuild r) {
             Entry entry = (Entry) o;
             logger.info("Entry " + o);
             entries.add(entry);
-            files.addAll(entry.getAffectedFiles());
+            try{
+            	files.addAll(entry.getAffectedFiles());
+            } catch (UnsupportedOperationException e) {
+            	logger.info(e.getMessage());
+            	return null;
+            }
         }
         if (entries.isEmpty()) {
             logger.info("Empty change...");
diff --git a/src/main/java/jenkins/plugins/hipchat/HipChatNotifier.java b/src/main/java/jenkins/plugins/hipchat/HipChatNotifier.java
index d995851..7689aa4 100644
--- a/src/main/java/jenkins/plugins/hipchat/HipChatNotifier.java
+++ b/src/main/java/jenkins/plugins/hipchat/HipChatNotifier.java
@@ -33,19 +33,19 @@ public DescriptorImpl getDescriptor() {
     }
 
     public String getRoom() {
-        return room;
+        return this.room;
     }
 
     public String getAuthToken() {
-        return authToken;
+        return this.authToken;
     }
 
     public String getBuildServerUrl() {
-        return buildServerUrl;
+        return this.buildServerUrl;
     }
 
     public String getSendAs() {
-        return sendAs;
+        return this.sendAs;
     }
 
 
@@ -144,6 +144,7 @@ public static class HipChatJobProperty extends hudson.model.JobProperty<Abstract
         private boolean notifyUnstable;
         private boolean notifyFailure;
         private boolean notifyBackToNormal;
+        private boolean alwaysShowNotification;
 
 
         @DataBoundConstructor
@@ -154,7 +155,8 @@ public HipChatJobProperty(String room,
                                   boolean notifyNotBuilt,
                                   boolean notifySuccess,
                                   boolean notifyUnstable,
-                                  boolean notifyBackToNormal) {
+                                  boolean notifyBackToNormal,
+                                  boolean alwaysShowNotification) {
             this.room = room;
             this.startNotification = startNotification;
             this.notifyAborted = notifyAborted;
@@ -163,6 +165,7 @@ public HipChatJobProperty(String room,
             this.notifySuccess = notifySuccess;
             this.notifyUnstable = notifyUnstable;
             this.notifyBackToNormal = notifyBackToNormal;
+            this.alwaysShowNotification = alwaysShowNotification;
         }
 
         @Exported
@@ -219,6 +222,9 @@ public boolean getNotifyBackToNormal() {
             return notifyBackToNormal;
         }
 
+        @Exported
+        public boolean getAlwaysShowNotification() { return alwaysShowNotification; }
+
         @Extension
         public static final class DescriptorImpl extends JobPropertyDescriptor {
             public String getDisplayName() {
@@ -239,7 +245,8 @@ public HipChatJobProperty newInstance(StaplerRequest sr, JSONObject formData) th
                         sr.getParameter("hipChatNotifyNotBuilt") != null,
                         sr.getParameter("hipChatNotifySuccess") != null,
                         sr.getParameter("hipChatNotifyUnstable") != null,
-                        sr.getParameter("hipChatNotifyBackToNormal") != null);
+                        sr.getParameter("hipChatNotifyBackToNormal") != null,
+                        sr.getParameter("hipChatAlwaysShowNotification") != null);
             }
         }
     }
diff --git a/src/main/java/jenkins/plugins/hipchat/HipChatService.java b/src/main/java/jenkins/plugins/hipchat/HipChatService.java
index 320d2b2..49c6fda 100644
--- a/src/main/java/jenkins/plugins/hipchat/HipChatService.java
+++ b/src/main/java/jenkins/plugins/hipchat/HipChatService.java
@@ -4,4 +4,6 @@ public interface HipChatService {
     void publish(String message);
 
     void publish(String message, String color);
+
+    void publish(String message, String color, Boolean notify);
 }
diff --git a/src/main/java/jenkins/plugins/hipchat/StandardHipChatService.java b/src/main/java/jenkins/plugins/hipchat/StandardHipChatService.java
index 0691c9c..907c271 100644
--- a/src/main/java/jenkins/plugins/hipchat/StandardHipChatService.java
+++ b/src/main/java/jenkins/plugins/hipchat/StandardHipChatService.java
@@ -31,8 +31,12 @@ public void publish(String message) {
     }
 
     public void publish(String message, String color) {
+        publish(message, color, false);
+    }
+
+    public void publish(String message, String color, Boolean notify) {
         for (String roomId : roomIds) {
-            logger.info("Posting: " + from + " to " + roomId + ": " + message + " " + color);
+            logger.info("Posting: " + from + " to " + roomId + ": " + message + " " + color + " " + notify);
             HttpClient client = getHttpClient();
             String url = "https://" + host + "/v1/rooms/message?auth_token=" + token;
             PostMethod post = new PostMethod(url);
@@ -42,7 +46,7 @@ public void publish(String message, String color) {
                 post.addParameter("room_id", roomId);
                 post.addParameter("message", message);
                 post.addParameter("color", color);
-                post.addParameter("notify", shouldNotify(color));
+                post.addParameter("notify", shouldNotify(color, notify));
                 post.getParams().setContentCharset("UTF-8");
                 int responseCode = client.executeMethod(post);
                 String response = post.getResponseBodyAsString();
@@ -68,10 +72,14 @@ private HttpClient getHttpClient() {
         return client;
     }
 
-    private String shouldNotify(String color) {
+    private String shouldColorNotify(String color) {
         return color.equalsIgnoreCase("green") ? "0" : "1";
     }
 
+    private String shouldNotify(String color, Boolean notify) {
+        return notify ? "1" : shouldColorNotify(color);
+    }
+
     void setHost(String host) {
         this.host = host;
     }
diff --git a/src/main/resources/jenkins/plugins/hipchat/HipChatNotifier/HipChatJobProperty/config.jelly b/src/main/resources/jenkins/plugins/hipchat/HipChatNotifier/HipChatJobProperty/config.jelly
index 0cc16c1..375fbe6 100644
--- a/src/main/resources/jenkins/plugins/hipchat/HipChatNotifier/HipChatJobProperty/config.jelly
+++ b/src/main/resources/jenkins/plugins/hipchat/HipChatNotifier/HipChatJobProperty/config.jelly
@@ -1,13 +1,13 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 
-	<f:section title="HipChat Notifications">
-    	<f:entry title="Project Room">
-      		<f:textbox name="hipChatProjectRoom" value="${instance.getRoom()}"/>
-    	</f:entry>
+    <f:section title="HipChat Notifications">
+        <f:entry title="Project Room">
+            <f:textbox name="hipChatProjectRoom" value="${instance.getRoom()}"/>
+        </f:entry>
 
-    	<f:entry title="Notify Build Start">
-      		<f:checkbox name="hipChatStartNotification" value="true" checked="${instance.getStartNotification()}"/>
-    	</f:entry>
+        <f:entry title="Notify Build Start">
+            <f:checkbox name="hipChatStartNotification" value="true" checked="${instance.getStartNotification()}"/>
+        </f:entry>
 
         <f:entry title="Notify Aborted">
             <f:checkbox name="hipChatNotifyAborted" value="true" checked="${instance.getNotifyAborted()}"/>
@@ -33,6 +33,9 @@
             <f:checkbox name="hipChatNotifyBackToNormal" value="true" checked="${instance.getNotifyBackToNormal()}"/>
         </f:entry>
 
+        <f:entry title="Always Show Notification">
+            <f:checkbox name="hipChatAlwaysShowNotification" value="true" checked="${instance.getAlwaysShowNotification()}"/>
+        </f:entry>
     </f:section>
 
 </j:jelly>