Merge "Add an error message for debugging"