Fixed activity log so it will return on error instead of timing out