Fixed error reporting to catch exceptions from Futures
Overlap fix