fixes #3960 - wrap APIv2 errors in an "error" node
(cherry picked from commit 0f7d219a4a65cd795eecd05117b08511d9025de2)
fixes #3960 - wrap APIv2 errors in an "error" node
(cherry picked from commit 0f7d219a4a65cd795eecd05117b08511d9025de2)