diff --git a/lib/core/lib/mapping.js b/lib/core/lib/mapping.js
index eab9ddc9..baeb4e2f 100644
--- a/lib/core/lib/mapping.js
+++ b/lib/core/lib/mapping.js
@@ -70,7 +70,7 @@ function mapTeamList (row) {
     description: row.description,
     path: row.path,
     organizationId: row.org_id,
-    usersCount: parseInt(row.users_count)
+    usersCount: parseInt(row.users_count, 10)
   }
 }
 
diff --git a/lib/core/lib/ops/teamOps.js b/lib/core/lib/ops/teamOps.js
index 885c67ba..733d9426 100644
--- a/lib/core/lib/ops/teamOps.js
+++ b/lib/core/lib/ops/teamOps.js
@@ -256,7 +256,7 @@ function loadTeamUsers (job, next) {
   job.client.query(sql, function (err, result) {
     if (err) return next(Boom.badImplementation(err))
 
-    job.totalUsersCount = result.rowCount > 0 ? parseInt(result.rows[0].total_users_count) : 0
+    job.totalUsersCount = result.rowCount > 0 ? parseInt(result.rows[0].total_users_count, 10) : 0
     job.team.usersCount = result.rowCount
     job.team.users = result.rows.map(mapping.user.simple)
     next()
diff --git a/lib/server/start.js b/lib/server/start.js
index c5670996..fe295872 100644
--- a/lib/server/start.js
+++ b/lib/server/start.js
@@ -1,6 +1,10 @@
 'use strict'
 
 const Server = require('./index')
-Server.start(() => {
+Server.start((err) => {
+  if (err) {
+    return console.log(`Failed to start server: ${err.message}`)
+  }
+
   console.log('Server started on: ' + Server.info.uri.toLowerCase())
 })
diff --git a/package.json b/package.json
index 660b0a1a..fddc0287 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "udaru",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A policy based authorization module",
   "license": "MIT",
   "author": "nearForm Ltd",