diff --git a/reverse_engineering/api.js b/reverse_engineering/api.js
index e4f70bf..056f69c 100644
--- a/reverse_engineering/api.js
+++ b/reverse_engineering/api.js
@@ -23,7 +23,7 @@ module.exports = {
 
 			validationHelper.validate(filterSchema(openAPISchema), { resolve: { external: false }})
 				.then((messages) => {
-					if (!Array.isArray(messages) || !messages.length) {
+					if (!Array.isArray(messages) || !messages.length || (messages.length === 1 && messages[0].type === 'success')) {
 						this.handleErrors(error, logger, callback);
 					}
 
@@ -41,8 +41,8 @@ module.exports = {
 	},
 
 	handleErrors(errorObject, logger, callback) {
-		const { error, title } = errorObject;
-		const handledError =  commonHelper.handleErrorObject(error, title);
+		const { error, title, name } = errorObject;
+		const handledError =  commonHelper.handleErrorObject(error || errorObject, title || name);
 		logger.log('error', handledError, title);
 		callback(handledError);
 	},
diff --git a/reverse_engineering/helpers/dataHelper.js b/reverse_engineering/helpers/dataHelper.js
index 3ee45aa..59b531d 100644
--- a/reverse_engineering/helpers/dataHelper.js
+++ b/reverse_engineering/helpers/dataHelper.js
@@ -66,7 +66,7 @@ const getServersData = (servers) => {
 		if (!server.url) {
 			return accum;
 		}
-		
+
 		const variables = server.variables ? getServersVariables(server.variables) : [];
 		return [...accum, {
 			serverURL: server.url,
@@ -82,7 +82,7 @@ const getServersVariables = (variables) => {
 		const variableData = variables[variable];
 		return {
 			serverVariableName: variable,
-			serverVariableEnum: variableData.enum.map(enumVal => ({serverVariableEnumValue: enumVal})),
+			serverVariableEnum: (variableData.enum || []).map(enumVal => ({serverVariableEnumValue: enumVal})),
 			serverVariableDefault: variableData.default,
 			serverVariableDescription: variableData.description,
 			scopesExtensions: getExtensions(variables)