Feature/zen 15755

Need to handle exceptions when receiving data