Added try/catch block to prevent issues upstream