diff --git a/module/mr/view/diff.html.php b/module/mr/view/diff.html.php
index 69d792ac7b..e0065e2b75 100644
--- a/module/mr/view/diff.html.php
+++ b/module/mr/view/diff.html.php
@@ -156,7 +156,16 @@ js::set('browser', $browser);
       <?php endif;?>
     </div>
     <?php else:?>
-    <?php include '../../repo/view/diffeditor.html.php';?>
+    <?php
+    if(empty($diffs))
+    {
+        echo "<p class='detail-content'>{$lang->mr->noChanges}</p>";
+    }
+    else
+    {
+        include '../../repo/view/diffeditor.html.php';
+    }
+    ?>
     <?php endif;?>
   </div>
 </div>
diff --git a/module/repo/model.php b/module/repo/model.php
index 3e0727ef4c..79d3d9c47e 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -2341,10 +2341,10 @@ class repoModel extends model
      * @access public
      * @return string
      */
-    public function getFileTree($repo, $branch = '', $diffs = array())
+    public function getFileTree($repo, $branch = '', $diffs = null)
     {
         $allFiles = array();
-        if(empty($diffs))
+        if(is_null($diffs))
         {
             if($repo->SCM != 'Subversion' and empty($branch)) $branch = $this->cookie->repoBranch;
             $files = $this->dao->select('t1.path,t1.action')->from(TABLE_REPOFILES)->alias('t1')