Made a few sanity checking adjustments

Not sure how to transfer an object from one page to another. :\