diff --git a/src/v1_TeslaMateAPICarsChargesDetails.go b/src/v1_TeslaMateAPICarsChargesDetails.go
index b6e39d0..5b9100b 100644
--- a/src/v1_TeslaMateAPICarsChargesDetails.go
+++ b/src/v1_TeslaMateAPICarsChargesDetails.go
@@ -150,6 +150,11 @@ func TeslaMateAPICarsChargesDetailsV1(c *gin.Context) {
 
 	// looping through all results
 	for rows.Next() {
+		
+		// skip a malformed charge
+ 		if end_date == NULL {
+ 			break
+ 		}
 
 		// creating charge object based on struct
 		charge := Charge{}