Added try/catch #5427