diff --git a/src/events/authValidateContext.js b/src/events/authValidateContext.js
index 28ef5d6b8..f2fbfd579 100644
--- a/src/events/authValidateContext.js
+++ b/src/events/authValidateContext.js
@@ -7,8 +7,9 @@ function internalServerError(message) {
   const errorType = 'AuthorizerConfigurationException'
 
   const error = Boom.internal()
-  error.output.payload.message = message
+
   error.output.payload.error = errorType
+  error.output.payload.message = message
   error.output.headers['x-amzn-ErrorType'] = errorType
 
   return error
@@ -17,7 +18,7 @@ function internalServerError(message) {
 function isValidContext(context) {
   return values(context).every(
     (i) =>
-      typeof i === 'string' || typeof i === 'boolean' || typeof i === 'number',
+      typeof i === 'boolean' || typeof i === 'number' || typeof i === 'string',
   )
 }