Adding calling location to track down errors