Minor error handling/validation improvement for batch operations.