diff --git a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
index e05c2ac..f282046 100644
--- a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
+++ b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
@@ -112,7 +112,10 @@
 					<Modal.Title>{title}</Modal.Title>
 				</Modal.Header>
 				<Modal.Body>
-					{ComponentToRender ? <ComponentToRender {...modalComponentProps}/> :  msg}
+					{ComponentToRender ?
+						<ComponentToRender {...modalComponentProps}/> :
+						<div> {msg && msg.split('\n').map(txt => <span> {txt} <br/> </span>)} </div>
+					}
 				</Modal.Body>
 				{(onConfirmed || onDeclined || type !== typeEnum.DEFAULT) &&
 						<ModalFooter
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
index 41306a1..db7afd2 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
@@ -114,7 +114,7 @@
 			}
 		}
 	}
-	return str;
+	return str.replace(/\n$/, '');
 }
 
 function parseUploadErrorMsg(error) {
@@ -124,7 +124,7 @@
 			message += objToString(error[key]) + '\n';
 		}
 	}
-	return message;
+	return message.replace(/\n$/, '');
 }
 
 function fetchSoftwareProductCategories(dispatch) {