From 85e153337e0a44cf958f1d86361e6e28c585370d Mon Sep 17 00:00:00 2001
From: Inga Lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Wed, 1 Feb 2017 10:35:02 +0300
Subject: [PATCH] Bug fixes

---
 BuildServer/lib/commenter.js           | 2 +-
 BuildServer/lib/tasks/dotnetrewrite.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BuildServer/lib/commenter.js b/BuildServer/lib/commenter.js
index 98f41d9..6932367 100644
--- a/BuildServer/lib/commenter.js
+++ b/BuildServer/lib/commenter.js
@@ -195,7 +195,7 @@ exports.commentOnPullRequest = (options, callback) => {
     options.github = settings.createGithub(options.baseRepoOptions.owner);
 
     return checkPullRequest(options, (err, successMessage) => getStatusMessageFromRelease(options.app, options.headRepoOptions, (err, successMessage) => {
-        const escapedErr = err.substring(0, 64000).replace(/`/g, "` ");
+        const escapedErr = (err || "").substring(0, 64000).replace(/`/g, "` ");
         const message = err
             ? `Was not built:\r\n\r\n\`\`\`\r\n${escapedErr}\r\n\`\`\`\r\n\r\nDO NOT MERGE!`
             : `Build OK\r\n\r\n${successMessage}`;
diff --git a/BuildServer/lib/tasks/dotnetrewrite.js b/BuildServer/lib/tasks/dotnetrewrite.js
index 6741493..d2146af 100644
--- a/BuildServer/lib/tasks/dotnetrewrite.js
+++ b/BuildServer/lib/tasks/dotnetrewrite.js
@@ -25,7 +25,7 @@ module.exports = (params, processor) => ({
             }
 
             if (appendInformationalVersion) {
-                content = `${content}\n[assembly: System.Reflection.AssemblyInformationalVersion("${processor.context.versionInfo}")]`;
+                content = `${content}\n[assembly: System.Reflection.AssemblyInformationalVersion("${processor.context.versionInfo}")]\n`;
             }
 
             return cb(null, content);