Issue 137711 - Thurgood Crashing

Thurgood issue fixed.
Merge pull request #72 from rohit-manethiya/rohitm-I-137711

Issue 137711 - Thurgood Crashing