Revert intro of WithError
for most key sources
#1146
Merged
WithError
for most key sources
#1146