diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5380df456..8894b9f05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Prowide ISO 20022 - CHANGELOG
 
+#### 10.1.7 - August 2024
+  * (PW-1958) Fixed the `DefaultMxMetadataStrategy` NPE issue when the amount values are null
+
 #### 10.1.6 - May 2024
   * (PW-1875) Changed the BusinessApplicationHeaderV01 marshaller to always use Zulu timezone with "Z" indicator
 
diff --git a/iso20022-core/src/main/java/com/prowidesoftware/swift/model/mx/DefaultMxMetadataStrategy.java b/iso20022-core/src/main/java/com/prowidesoftware/swift/model/mx/DefaultMxMetadataStrategy.java
index bfe91aa68..c8dcb53ea 100644
--- a/iso20022-core/src/main/java/com/prowidesoftware/swift/model/mx/DefaultMxMetadataStrategy.java
+++ b/iso20022-core/src/main/java/com/prowidesoftware/swift/model/mx/DefaultMxMetadataStrategy.java
@@ -91,7 +91,7 @@ public Optional<Money> amount(AbstractMessage message) {
 
     private Money getCamt29Amount(MxNode document) {
         MxNode amount = document.findFirst("./RsltnOfInvstgtn/CxlDtls/OrgnlPmtInfAndSts/TxInfAndSts/OrgnlInstdAmt");
-        if (amount != null) {
+        if (amount != null && amount.getValue() != null) {
             return new Money(amount.getAttribute("Ccy"), new BigDecimal(amount.getValue()));
         }
         return null;
@@ -99,7 +99,7 @@ private Money getCamt29Amount(MxNode document) {
 
     private Money getCamt52Amount(MxNode document) {
         MxNode amount = document.findFirst("./BkToCstmrAcctRpt/Rpt/Bal/Amt");
-        if (amount != null) {
+        if (amount != null && amount.getValue() != null) {
             return new Money(amount.getAttribute("Ccy"), new BigDecimal(amount.getValue()));
         }
         return null;
@@ -107,7 +107,7 @@ private Money getCamt52Amount(MxNode document) {
 
     private Money getCamt53Amount(MxNode document) {
         MxNode amount = document.findFirst("./BkToCstmrStmt/Stmt/Bal/Amt");
-        if (amount != null) {
+        if (amount != null && amount.getValue() != null) {
             return new Money(amount.getAttribute("Ccy"), new BigDecimal(amount.getValue()));
         }
         return null;
@@ -121,7 +121,7 @@ private Money getCamt54Amount(MxNode document) {
         if (amount == null) {
             amount = document.findFirst("./BkToCstmrDbtCdtNtfctn/Ntfctn/Ntry/NtryDtls/TxDtls/Amt");
         }
-        if (amount != null) {
+        if (amount != null && amount.getValue() != null) {
             return new Money(amount.getAttribute("Ccy"), new BigDecimal(amount.getValue()));
         }
         return null;
@@ -129,7 +129,7 @@ private Money getCamt54Amount(MxNode document) {
 
     private Money getCamt56Amount(MxNode document) {
         MxNode amount = document.findFirst("./FIToFIPmtCxlReq/Undrlyg/TxInf/OrgnlIntrBkSttlmAmt");
-        if (amount != null) {
+        if (amount != null && amount.getValue() != null) {
             return new Money(amount.getAttribute("Ccy"), new BigDecimal(amount.getValue()));
         }
         return null;
@@ -137,7 +137,7 @@ private Money getCamt56Amount(MxNode document) {
 
     private Money getCamt57Amount(MxNode document) {
         MxNode amount = document.findFirst("./NtfctnToRcv/Ntfctn/TtlAmt");
-        if (amount != null) {
+        if (amount != null && amount.getValue() != null) {
             return new Money(amount.getAttribute("Ccy"), new BigDecimal(amount.getValue()));
         }
         return null;
@@ -148,7 +148,7 @@ private Money getPacs004Amount(MxNode document) {
         if (amount == null) {
             amount = document.findFirst("./PmtRtr/TxInf/RtrdIntrBkSttlmAmt");
         }
-        if (amount != null) {
+        if (amount != null && amount.getValue() != null) {
             return new Money(amount.getAttribute("Ccy"), new BigDecimal(amount.getValue()));
         }
         return null;
@@ -181,7 +181,7 @@ private Money getPacsAmount(MxNode document) {
         MxNode cdtTrfNode = document.findFirstByName("CdtTrfTxInf");
         if (cdtTrfNode != null) {
             MxNode amount = cdtTrfNode.findFirst("./IntrBkSttlmAmt");
-            if (amount != null) {
+            if (amount != null && amount.getValue() != null) {
                 return new Money(amount.getAttribute("Ccy"), new BigDecimal(amount.getValue()));
             }
         }
diff --git a/iso20022-core/src/test/java/com/prowidesoftware/issues/Issue1958.java b/iso20022-core/src/test/java/com/prowidesoftware/issues/Issue1958.java
new file mode 100644
index 000000000..a1ad67acf
--- /dev/null
+++ b/iso20022-core/src/test/java/com/prowidesoftware/issues/Issue1958.java
@@ -0,0 +1,114 @@
+package com.prowidesoftware.issues;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import com.prowidesoftware.swift.model.MxSwiftMessage;
+import org.junit.jupiter.api.Test;
+
+public class Issue1958 {
+
+    @Test
+    void test() {
+        try {
+            String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
+                    + "<RequestPayload>"
+                    + "<h:AppHdr xmlns:h=\"urn:swift:xsd:$ahV10\">"
+                    + "    <h:From>"
+                    + "        <h:Type>BIC</h:Type>"
+                    + "        <h:Id>AAAANGL0XXX</h:Id>"
+                    + "    </h:From>"
+                    + "    <h:To>"
+                    + "        <h:Type>BIC</h:Type>"
+                    + "        <h:Id>BBBBUS33XXX</h:Id>"
+                    + "     </h:To>"
+                    + "     <h:MsgName>pacs.008.001.08</h:MsgName>"
+                    + "     <h:MsgRef>FOOBAR1</h:MsgRef>"
+                    + "     <h:CrDate>2022-05-05T06:07:14Z</h:CrDate>"
+                    + "</h:AppHdr>"
+                    + "<Doc:Document xmlns:Doc=\"urn:iso:std:iso:20022:tech:xsd:pacs.008.001.08\">"
+                    + "    <Doc:FIToFICstmrCdtTrf>"
+                    + "        <Doc:GrpHdr>"
+                    + "            <Doc:MsgId>FOOBAR2</Doc:MsgId>"
+                    + "            <Doc:CreDtTm>2022-05-05T06:07:14Z</Doc:CreDtTm>"
+                    + "            <Doc:NbOfTxs>1</Doc:NbOfTxs>"
+                    + "            <Doc:SttlmInf>"
+                    + "                <Doc:SttlmMtd>INDA</Doc:SttlmMtd>"
+                    + "                <Doc:SttlmAcct>"
+                    + "                    <Doc:Id>"
+                    + "                        <Doc:Othr>"
+                    + "                            <Doc:Id>04435001</Doc:Id>"
+                    + "                        </Doc:Othr>"
+                    + "                    </Doc:Id>"
+                    + "                </Doc:SttlmAcct>"
+                    + "            </Doc:SttlmInf>"
+                    + "            <Doc:InstgAgt>"
+                    + "                <Doc:FinInstnId>"
+                    + "                    <Doc:BICFI>AAAANGL0XXX</Doc:BICFI>"
+                    + "                </Doc:FinInstnId>"
+                    + "            </Doc:InstgAgt>"
+                    + "            <Doc:InstdAgt>"
+                    + "                <Doc:FinInstnId>"
+                    + "                    <Doc:BICFI>BBBBUS33XXX</Doc:BICFI>"
+                    + "                </Doc:FinInstnId>"
+                    + "            </Doc:InstdAgt>"
+                    + "        </Doc:GrpHdr>"
+                    + "        <Doc:CdtTrfTxInf>"
+                    + "            <Doc:PmtId>"
+                    + "                <Doc:InstrId>REF333222333</Doc:InstrId>"
+                    + "                <Doc:EndToEndId>RRRR345345</Doc:EndToEndId>"
+                    + "                <Doc:TxId>FFDD34534</Doc:TxId>"
+                    + "            </Doc:PmtId>"
+                    + "            <Doc:IntrBkSttlmAmt Ccy=\"USD\"></Doc:IntrBkSttlmAmt>"
+                    + "            <Doc:IntrBkSttlmDt>2022-05-05</Doc:IntrBkSttlmDt>"
+                    + "            <Doc:InstdAmt Ccy=\"USD\"></Doc:InstdAmt>"
+                    + "            <Doc:ChrgBr>DEBT</Doc:ChrgBr>"
+                    + "            <Doc:Dbtr>"
+                    + "                <Doc:Nm>FOO FEED MILLS COLTD</Doc:Nm>"
+                    + "                <Doc:PstlAdr>"
+                    + "                    <Doc:AdrLine>1 GOLDEN PENNY PLACE, WHARF ROAD,</Doc:AdrLine>"
+                    + "                    <Doc:AdrLine>APAPA LAGOS</Doc:AdrLine>"
+                    + "                </Doc:PstlAdr>"
+                    + "            </Doc:Dbtr>"
+                    + "            <Doc:DbtrAcct>"
+                    + "                <Doc:Id>"
+                    + "                    <Doc:Othr>"
+                    + "                        <Doc:Id>2028766092</Doc:Id>"
+                    + "                    </Doc:Othr>"
+                    + "                </Doc:Id>"
+                    + "            </Doc:DbtrAcct>"
+                    + "            <Doc:DbtrAgt>"
+                    + "                <Doc:FinInstnId>"
+                    + "                    <Doc:BICFI>AAAANGLA</Doc:BICFI>"
+                    + "                </Doc:FinInstnId>"
+                    + "            </Doc:DbtrAgt>"
+                    + "            <Doc:CdtrAgt>"
+                    + "                <Doc:FinInstnId>"
+                    + "                    <Doc:BICFI>BBBBRU21</Doc:BICFI>"
+                    + "                </Doc:FinInstnId>"
+                    + "            </Doc:CdtrAgt>"
+                    + "            <Doc:Cdtr>"
+                    + "                <Doc:Nm>TEST</Doc:Nm>"
+                    + "                <Doc:PstlAdr>"
+                    + "                    <Doc:AdrLine>TEST</Doc:AdrLine>"
+                    + "                </Doc:PstlAdr>"
+                    + "            </Doc:Cdtr>"
+                    + "            <Doc:CdtrAcct>"
+                    + "                <Doc:Id>"
+                    + "                    <Doc:Othr>"
+                    + "                        <Doc:Id>TEST</Doc:Id>"
+                    + "                    </Doc:Othr>"
+                    + "                </Doc:Id>"
+                    + "            </Doc:CdtrAcct>"
+                    + "            <Doc:RmtInf>"
+                    + "                <Doc:Ustrd>AGRICULTURAL SECTOR</Doc:Ustrd>"
+                    + "            </Doc:RmtInf>"
+                    + "        </Doc:CdtTrfTxInf>"
+                    + "    </Doc:FIToFICstmrCdtTrf>"
+                    + "</Doc:Document>"
+                    + "</RequestPayload>";
+            new MxSwiftMessage(xml);
+        } catch (Exception e) {
+            fail();
+        }
+    }
+}