diff --git a/packages/base-model/package.json b/packages/base-model/package.json
index 2ffbf7e7a0271e06c52e1f8210e47446889a0a92..abf0aede687c11dddfe5462a33e527758884184e 100644
--- a/packages/base-model/package.json
+++ b/packages/base-model/package.json
@@ -11,12 +11,15 @@
   "dependencies": {
     "@pubsweet/db-manager": "^2.2.0",
     "@pubsweet/logger": "^0.2.9",
-    "pubsweet-server": "^11.0.0",
+    "http-status-codes": "^1.3.0",
     "knex": "^0.16.3",
     "lodash": "^4.17.11",
     "objection": "^1.2.3",
     "uuid": "^3.3.2"
   },
+  "devDependencies": {
+    "pubsweet-server": "^11.0.0"
+  },
   "peerDependencies": {
     "config": "^3.0.1"
   },
diff --git a/packages/base-model/src/NotFoundError.js b/packages/base-model/src/NotFoundError.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d7c2f9623a566c70abf034059b9a79dd3867cbc
--- /dev/null
+++ b/packages/base-model/src/NotFoundError.js
@@ -0,0 +1,13 @@
+const STATUS = require('http-status-codes')
+
+class NotFoundError extends Error {
+  constructor(message, status) {
+    super(message)
+    Error.captureStackTrace(this, 'NotFoundError')
+    this.name = 'NotFoundError'
+    this.message = message || 'Not found'
+    this.status = status || STATUS.NOT_FOUND
+  }
+}
+
+module.exports = NotFoundError
diff --git a/packages/base-model/src/index.js b/packages/base-model/src/index.js
index 0fecd507930d7984545f6be7ff0fb133769ef9eb..dab87ca631a794d81c3daeeb4be1133867707640 100644
--- a/packages/base-model/src/index.js
+++ b/packages/base-model/src/index.js
@@ -1,7 +1,7 @@
 const uuid = require('uuid')
 const { Model, transaction } = require('objection')
 const logger = require('@pubsweet/logger')
-const { NotFoundError } = require('pubsweet-server/src/errors')
+const NotFoundError = require('./NotFoundError')
 const db = require('@pubsweet/db-manager/src/db')
 const { merge } = require('lodash')
 const config = require('config')
diff --git a/packages/components/FormGroup/package.json b/packages/components/FormGroup/package.json
index 8596c2b4190eef6bdeb5ce643a042d4902d37e77..13aedd2864ba060b09a404628d0c7d13abdf1701 100644
--- a/packages/components/FormGroup/package.json
+++ b/packages/components/FormGroup/package.json
@@ -7,10 +7,10 @@
   "license": "MIT",
   "dependencies": {
     "joi-browser": "^13.4.0",
-    "prop-types": "^15.5.10",
-    "pubsweet-server": "^11.0.0"
+    "prop-types": "^15.5.10"
   },
   "peerDependencies": {
+    "pubsweet-server": ">=11.0.0",
     "pubsweet-client": ">=1.0.0",
     "react": ">=16"
   },