 		teamManagerId = AuthenticationController.getLoggedInUserId(req)
 
 		TeamInvitesHandler.revokeInvite teamManagerId, email, (err, results) ->
-			next(err) if err?
+			return handleError(err, req, res, next) if err?
 
 			res.sendStatus 204
+
+handleError = (err, req, res, next) ->
+	if err.teamNotFound or err.inviteNoLongerValid
+		ErrorController.notFound(req, res, next)
+	else
+		next(err)

		email   = req.body.email

		TeamInvitesHandler.createInvite teamManagerId, email, (err, invite) ->
			next(err) if err?
			inviteView = { user:
				{ email: invite.email, sentAt: invite.sentAt, holdingAccount: true }
			}

					hasPersonalSubscription: personalSubscription?
					appName: settings.appName

	acceptInvite: (req, res, next) ->
		token = req.params.token
		userId = AuthenticationController.getLoggedInUserId(req)

		TeamInvitesHandler.acceptInvite token, userId, (err, results) ->
			return handleError(err, req, res, next) if err?

		res.sendStatus 204

