add some checking around what gets returned #2

Closed jason-adnuntius closed 5 years ago