fixing error handling that was breaking normal path..