Handle case where batch update result is empty, fixes #158

Log out the error state and carry on
Merge branch 'master' into builds
7.504