var logger       = require('morgan');
var path         = require('path');
var express      = require('express');
var favicon      = require('serve-favicon');
var cookieParser = require('cookie-parser');
var bodyParser   = require('body-parser');

var routes   = require('./routes/index');
var listings = require('./routes/listings');
var listing  = require('./routes/listing');

var app      = express();
app.use(express.static(path.join(__dirname, 'public')));
//app.use(function(req, res) {
//  res.locals.test = app.get('env') !== 'production' && req.query.test === '1';
//});

// view engine setup
var exphbs   = require('express-secure-handlebars');
app.engine('hbs', exphbs({defaultLayout: 'main', extname: '.hbs'}));
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'hbs');

app.use(logger('dev'));

// uncomment after placing your favicon in /public
app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));

app.use(cookieParser());

app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: false }));

// map routes
app.use('/', routes);
app.use('/listings', listings);
app.use('/listing',  listing);

// catch 404 and forward to error handler
app.use(function(req, res, next) {
  var err = new Error('Not Found');
  err.status = 404;
  next(err);
});

// error handlers

// development error handler
// will print stacktrace
if (app.get('env') === 'development') {
  app.use(function(err, req, res) {
    res.status(err.status || 500);
    res.render('error', {
      message: err.message,
      error: err
    });
  });
}

// production error handler
// no stacktraces leaked to user
app.use(function(err, req, res) {
  res.status(err.status || 500);
  res.render('error', {
    message: err.message,
    error: {}
  });
});

module.exports = app;

@@ -1440,24 +1440,30 @@
 rr, req, res
+, next
 ) %7B%0A    res.
@@ -1664,24 +1664,30 @@
 rr, req, res
+, next
 ) %7B%0A  res.st

Put 'next' back to the error handlers since express requires to see them to detect a handler as error handler