cleanup

actually want to ensure the original object is fetched even if a null typename is passed