Add try-catch