diff --git a/src/services/api/routes/v1/login.js b/src/services/api/routes/v1/login.js
index 2620c72..2899624 100644
--- a/src/services/api/routes/v1/login.js
+++ b/src/services/api/routes/v1/login.js
@@ -50,6 +50,14 @@ router.post('/', async (request, response) => {
 	let pnid;
 	if (grant_type === 'password') {
 		pnid = await database.getUserByUsername(username);
+		if (!pnid) {
+			return response.status(400).json({
+				app: 'api',
+				status: 400,
+				error: 'User not found'
+			});
+		}
+
 		const hashedPassword = util.nintendoPasswordHash(password, pnid.get('pid'));
 
 		if (!pnid || !bcrypt.compareSync(hashedPassword, pnid.password)) {