diff --git a/CNJ/decomposer.go b/CNJ/decomposer.go
index a944f29..0723246 100644
--- a/CNJ/decomposer.go
+++ b/CNJ/decomposer.go
@@ -86,7 +86,19 @@ func DecomposeCNJ(cnj string) (DecomposedCNJ, error) {
 
 		dt, err := CNJDatabase.FetchDistrict(semiCNJ)
 		if err != nil {
-			return DecomposedCNJ{}, err
+			if err != nil {
+				return DecomposedCNJ{
+					LawsuitNumber:  lawsuitNumber,
+					VerifyingDigit: verifyingDigit,
+					ProtocolYear:   yearProtocol,
+					Segment:        segment,
+					Court:          court,
+					SourceUnit:     sourceUnit,
+					ArgNumber:      argNumber,
+					District:       err.Error(),
+					UF:             err.Error(),
+				}, err
+			}
 		}
 
 		return DecomposedCNJ{