From aa169dde7f4a6384ff6bac77a1c4fecb6bb06cc6 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Wed, 6 Mar 2019 09:56:10 +0200
Subject: [PATCH] Updated resonder checks before returning reply

---
 engine/responder.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/engine/responder.go b/engine/responder.go
index cedf86dd8..dc2e04a97 100644
--- a/engine/responder.go
+++ b/engine/responder.go
@@ -110,7 +110,9 @@ func (rs *Responder) Debit(arg *CallDescriptor, reply *CallCost) (err error) {
 	if r, err = arg.Debit(); err != nil {
 		return
 	}
-	*reply = *r
+	if r != nil {
+		*reply = *r
+	}
 	return
 }
 
@@ -145,7 +147,9 @@ func (rs *Responder) MaxDebit(arg *CallDescriptor, reply *CallCost) (err error)
 	if r, err = arg.MaxDebit(); err != nil {
 		return
 	}
-	*reply = *r
+	if r != nil {
+		*reply = *r
+	}
 	return
 }
 
@@ -180,7 +184,9 @@ func (rs *Responder) RefundIncrements(arg *CallDescriptor, reply *Account) (err
 	if acnt, err = arg.RefundIncrements(); err != nil {
 		return
 	}
-	*reply = *acnt
+	if acnt != nil {
+		*reply = *acnt
+	}
 	return
 }
 
@@ -221,8 +227,7 @@ func (rs *Responder) GetMaxSessionTime(arg *CallDescriptor, reply *time.Duration
 	if !rs.usageAllowed(arg.TOR, arg.GetDuration()) {
 		return utils.ErrMaxUsageExceeded
 	}
-	r, e := arg.GetMaxSessionDuration()
-	*reply, err = r, e
+	*reply, err = arg.GetMaxSessionDuration()
 	return
 }