Adding another class to prevent warnings and errors that arise from code outside of my control.  Now errors should only be appearing when they are errors that are my own.