diff --git a/pdf/src/annotations/base.js b/pdf/src/annotations/base.js
index b151410f35..b1abce1116 100644
--- a/pdf/src/annotations/base.js
+++ b/pdf/src/annotations/base.js
@@ -444,7 +444,7 @@
 
         let nComplexType = null;
 
-        if (AscPDF.BORDER_TYPES.solid == nBorderStyle) {
+        if (AscPDF.BORDER_TYPES.solid == nBorderStyle || undefined == nBorderStyle) {
             if (AscPDF.BORDER_EFFECT_STYLES.Cloud == nBorderEffectStyle) {
                 if (1 == nBorderEffectIntensity) {
                     nComplexType = AscPDF.ANNOT_COMPLEX_BORDER_TYPES.cloud1;
diff --git a/pdf/src/document.js b/pdf/src/document.js
index a0ab719369..12a999c272 100644
--- a/pdf/src/document.js
+++ b/pdf/src/document.js
@@ -9613,15 +9613,26 @@ var CPresentation = CPresentation || function(){};
     function CreateAscAnnotPropFromObj(annot) {
         let oProps = new Asc.asc_CAnnotProperty();
 
+		let nType = annot.GetType();
+		
         oProps.asc_putType(annot.GetType());
         
         // fill
-        let oFillColor  = annot.GetFillColor();
-        let oFillRGB    = annot.GetRGBColor(oFillColor);
-        oFillRGB["r"] = oFillRGB.r;
-        oFillRGB["g"] = oFillRGB.g;
-        oFillRGB["b"] = oFillRGB.b;
-        oProps.asc_putFill(oFillRGB);
+		switch (nType) {
+			case AscPDF.ANNOTATIONS_TYPES.FreeText:
+			case AscPDF.ANNOTATIONS_TYPES.Square:
+			case AscPDF.ANNOTATIONS_TYPES.Circle:
+			case AscPDF.ANNOTATIONS_TYPES.Polygon:
+			case AscPDF.ANNOTATIONS_TYPES.Redact: {
+				let oFillColor  = annot.GetFillColor();
+				let oFillRGB    = oFillColor ? annot.GetRGBColor(oFillColor) : undefined;
+				oFillRGB["r"] = oFillRGB.r;
+				oFillRGB["g"] = oFillRGB.g;
+				oFillRGB["b"] = oFillRGB.b;
+				oProps.asc_putFill(oFillRGB);
+				break;
+			}
+		}
 
         // stroke
         let oStrokeColor    = annot.GetStrokeColor();
@@ -9663,6 +9674,7 @@ var CPresentation = CPresentation || function(){};
             }
             case AscPDF.ANNOTATIONS_TYPES.Polygon:
             case AscPDF.ANNOTATIONS_TYPES.Square:
+            case AscPDF.ANNOTATIONS_TYPES.Link:
             case AscPDF.ANNOTATIONS_TYPES.Circle: {
                 oAnnotProps = new Asc.asc_CClosedAnnotProperty();
                 oAnnotProps.asc_putBorderStyle(annot.GetComplexBorderType());