Revert "WWW-479 add a try except block to fix bug."

This reverts commit 74562d423b41bdc7777c82b9f35cfdb4eed3f030.
Undo a bug-fix. Best for Juan to debug as he knows the code.