diff --git a/src/main/java/io/github/swagger2markup/internal/document/builder/OverviewDocumentBuilder.java b/src/main/java/io/github/swagger2markup/internal/document/builder/OverviewDocumentBuilder.java
index 5969bff8..dd6b9f30 100644
--- a/src/main/java/io/github/swagger2markup/internal/document/builder/OverviewDocumentBuilder.java
+++ b/src/main/java/io/github/swagger2markup/internal/document/builder/OverviewDocumentBuilder.java
@@ -136,10 +136,10 @@ public class OverviewDocumentBuilder extends MarkupDocumentBuilder {
                 ) {
             this.markupDocBuilder.sectionTitleLevel2(LICENSE_INFORMATION);
             MarkupDocBuilder paragraph = this.markupDocBuilder.copy(false);
-            if (isNotBlank(license.getName())) {
+            if (license != null && isNotBlank(license.getName())) {
                 paragraph.italicText(LICENSE).textLine(COLON + license.getName());
             }
-            if (isNotBlank(license.getUrl())) {
+            if (license != null && isNotBlank(license.getUrl())) {
                 paragraph.italicText(LICENSE_URL).textLine(COLON + license.getUrl());
             }
             if(isNotBlank(termOfService)){
diff --git a/src/main/java/io/github/swagger2markup/internal/document/builder/SecurityDocumentBuilder.java b/src/main/java/io/github/swagger2markup/internal/document/builder/SecurityDocumentBuilder.java
index 903c853e..ecc71866 100644
--- a/src/main/java/io/github/swagger2markup/internal/document/builder/SecurityDocumentBuilder.java
+++ b/src/main/java/io/github/swagger2markup/internal/document/builder/SecurityDocumentBuilder.java
@@ -40,6 +40,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
 public class SecurityDocumentBuilder extends MarkupDocumentBuilder {
 
     private static final String SECURITY_ANCHOR = "securityScheme";
+    private static final String COLON = " : ";
     private final String SECURITY;
     private final String TYPE;
     private final String NAME;
@@ -102,20 +103,26 @@ public class SecurityDocumentBuilder extends MarkupDocumentBuilder {
 
     private void buildSecurityScheme(SecuritySchemeDefinition securityScheme) {
         String type = securityScheme.getType();
-        markupDocBuilder.textLine(TYPE + " : " + type);
+        MarkupDocBuilder paragraph = markupDocBuilder.copy(false);
+        
+        paragraph.italicText(TYPE).textLine(COLON + type);
+        
         if (securityScheme instanceof ApiKeyAuthDefinition) {
-            markupDocBuilder.textLine(NAME + " : " + ((ApiKeyAuthDefinition) securityScheme).getName());
-            markupDocBuilder.textLine(IN + " : " + ((ApiKeyAuthDefinition) securityScheme).getIn());
+            paragraph.italicText(NAME).textLine(COLON + ((ApiKeyAuthDefinition) securityScheme).getName());
+            paragraph.italicText(IN).textLine(COLON + ((ApiKeyAuthDefinition) securityScheme).getIn());
+            
+            markupDocBuilder.paragraph(paragraph.toString(), true);
         } else if (securityScheme instanceof OAuth2Definition) {
             OAuth2Definition oauth2Scheme = (OAuth2Definition) securityScheme;
             String flow = oauth2Scheme.getFlow();
-            markupDocBuilder.textLine(FLOW + " : " + flow);
+            paragraph.italicText(FLOW).textLine(COLON + flow);
             if (isNotBlank(oauth2Scheme.getAuthorizationUrl())) {
-                markupDocBuilder.textLine(AUTHORIZATION_URL + " : " + oauth2Scheme.getAuthorizationUrl());
+                paragraph.italicText(AUTHORIZATION_URL).textLine(COLON + oauth2Scheme.getAuthorizationUrl());
             }
             if (isNotBlank(oauth2Scheme.getTokenUrl())) {
-                markupDocBuilder.textLine(TOKEN_URL + " : " + oauth2Scheme.getTokenUrl());
+                paragraph.italicText(TOKEN_URL).textLine(COLON + oauth2Scheme.getTokenUrl());
             }
+            
             List<List<String>> cells = new ArrayList<>();
             List<MarkupTableColumn> cols = Arrays.asList(new MarkupTableColumn(NAME_COLUMN).withWidthRatio(1),
                     new MarkupTableColumn(DESCRIPTION_COLUMN).withWidthRatio(6));
@@ -123,7 +130,11 @@ public class SecurityDocumentBuilder extends MarkupDocumentBuilder {
                 List<String> content = Arrays.asList(scope.getKey(), scope.getValue());
                 cells.add(content);
             }
+            
+            markupDocBuilder.paragraph(paragraph.toString(), true);
             markupDocBuilder.tableWithColumnSpecs(cols, cells);
+        } else {
+            markupDocBuilder.paragraph(paragraph.toString(), true);
         }
     }