(#2545) - throw errors instead of returning them