diff --git a/app.js b/app.js
index a22197c7..7b01ddf2 100644
--- a/app.js
+++ b/app.js
@@ -16,6 +16,7 @@ var config = require('./lib/config-loader'),
 
 var app = express();
 var httpServer = require('http').createServer(app);
+const maxPostSize = 1024*1024;
 
 app.set('view engine', 'html');
 
@@ -23,8 +24,8 @@ app.set('view engine', 'html');
  * Middleware
  */
 app.use("/public", express.static(__dirname + '/public'));
-app.use(bodyParser.urlencoded({ extended: false }));
-app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ limit: maxPostSize, extended: false }));
+app.use(bodyParser.json({limit: maxPostSize}));
 app.use(expressSession({
    secret: config.session.secret,
    resave: false,
diff --git a/models/pull.js b/models/pull.js
index b28db8e4..b7776c0c 100644
--- a/models/pull.js
+++ b/models/pull.js
@@ -155,6 +155,10 @@ Pull.prototype.getStatus = function getStatus() {
 Pull.parseBody = function(body) {
    var bodyTags = [];
 
+   if (!body) {
+      return [];
+   }
+
    config.body_tags.forEach(function(tag) {
       var matches = body.match(tag.regex);