diff --git a/modules/Bio/EnsEMBL/ArchiveStableId.pm b/modules/Bio/EnsEMBL/ArchiveStableId.pm
index bc039161c36716eb1088b54974987c8039990918..14c7430a309047a846541d1125e324b22413811a 100644
--- a/modules/Bio/EnsEMBL/ArchiveStableId.pm
+++ b/modules/Bio/EnsEMBL/ArchiveStableId.pm
@@ -222,16 +222,18 @@ sub get_translation_archive_id {
   my $self = shift;
 
   if( $self->type() eq "Transcript" ) {
-    return [$self->adaptor->fetch_by_transcript_archive_id( $self )];
+    my $T = $self->adaptor->fetch_by_transcript_archive_id( $self );
+    return $T ? [$T] : [];
   } elsif( $self->type() eq "Gene" ) {
     my $transcripts = $self->adaptor->fetch_all_by_gene_archive_id( $self );
-	my @peptides ;
-	for (@$transcripts) {
-		push @peptides , $self->adaptor->fetch_by_transcript_archive_id( $_ );
-	}
-	return \@peptides;
+    my @peptides ;
+    for (@$transcripts) {
+      my $T = $self->adaptor->fetch_by_transcript_archive_id( $_ );
+      push @peptides, $T if $T;
+    }
+    return \@peptides;
   } else {
-    return undef;
+    return [$self];
   }
 }