diff --git a/src/services/grpc/api/v2/login.ts b/src/services/grpc/api/v2/login.ts
index 6cfdb63..78c020f 100644
--- a/src/services/grpc/api/v2/login.ts
+++ b/src/services/grpc/api/v2/login.ts
@@ -75,15 +75,18 @@ export async function login(request: LoginRequest): Promise<DeepPartial<LoginRes
 	const accessTokenBuffer = await generateToken(config.aes_key, accessTokenOptions);
 	const refreshTokenBuffer = await generateToken(config.aes_key, refreshTokenOptions);
 
-	const accessToken = accessTokenBuffer ? accessTokenBuffer.toString('hex') : '';
-	const newRefreshToken = refreshTokenBuffer ? refreshTokenBuffer.toString('hex') : '';
+	if (!accessTokenBuffer) {
+		throw new ServerError(Status.INTERNAL, 'Failed to generate access token');
+	}
 
-	// TODO - Handle null tokens
+	if (!refreshTokenBuffer) {
+		throw new ServerError(Status.INTERNAL, 'Failed to generate refresh token');
+	}
 
 	return {
-		accessToken: accessToken,
+		accessToken: accessTokenBuffer.toString('hex'),
 		tokenType: 'Bearer',
 		expiresIn: 3600,
-		refreshToken: newRefreshToken
+		refreshToken: refreshTokenBuffer.toString('hex')
 	};
 }
diff --git a/src/services/grpc/api/v2/register.ts b/src/services/grpc/api/v2/register.ts
index e2e6e18..336ffbe 100644
--- a/src/services/grpc/api/v2/register.ts
+++ b/src/services/grpc/api/v2/register.ts
@@ -250,15 +250,18 @@ export async function register(request: RegisterRequest): Promise<DeepPartial<Lo
 	const accessTokenBuffer = await generateToken(config.aes_key, accessTokenOptions);
 	const refreshTokenBuffer = await generateToken(config.aes_key, refreshTokenOptions);
 
-	const accessToken = accessTokenBuffer ? accessTokenBuffer.toString('hex') : '';
-	const refreshToken = refreshTokenBuffer ? refreshTokenBuffer.toString('hex') : '';
+	if (!accessTokenBuffer) {
+		throw new ServerError(Status.INTERNAL, 'Failed to generate access token');
+	}
 
-	// TODO - Handle null tokens
+	if (!refreshTokenBuffer) {
+		throw new ServerError(Status.INTERNAL, 'Failed to generate refresh token');
+	}
 
 	return {
-		accessToken: accessToken,
+		accessToken: accessTokenBuffer.toString('hex'),
 		tokenType: 'Bearer',
 		expiresIn: 3600,
-		refreshToken: refreshToken
+		refreshToken: refreshTokenBuffer.toString('hex')
 	};
 }