Removed language requirement
Added try-catch block