Add necessary checks and fallbacks to avoid crashing when receiving incomplete payload
Add necessary checks and fallbacks to avoid crashing when receiving incomplete payload

danheberden/gith,startappdev/gith,lklepner/gith