Added try/catch for a bug...