Joindin 346

This contains Lorna's original code and about 3 new lines for dealing with the case when the stub doesn't exist. Without it, I was getting some warnings on the html output when the stub isn't found.