Fix up unresolved error handling some more