DEV-51120 - Added check to prevent : Uncaught error