Merge "Cleanup NN callback error handling"