Added two of the error catches

Have not tested either of them.