Issue #3154538 by isholgueras, drunken monkey: Fixed exception handling in datasource tracking methods.