diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/StubListing.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/StubListing.java
index fa9ced7e64..f6722b6ea7 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/StubListing.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/StubListing.java
@@ -83,22 +83,22 @@ public class StubListing implements Listing {
 	@Override
 	public AddressIterator getCommentAddressIterator(CommentType commentType,
 			AddressSetView addrSet, boolean forward) {
-		throw new UnsupportedOperationException();
+		return AddressIterator.EMPTY_ITERATOR;
 	}
 
 	@Override
 	public AddressIterator getCommentAddressIterator(AddressSetView addrSet, boolean forward) {
-		throw new UnsupportedOperationException();
+		return AddressIterator.EMPTY_ITERATOR;
 	}
 
 	@Override
 	public long getCommentAddressCount() {
-		throw new UnsupportedOperationException();
+		return 0;
 	}
 
 	@Override
 	public String getComment(CommentType commentType, Address address) {
-		throw new UnsupportedOperationException();
+		return null;
 	}
 
 	@Override