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