Catch more errors
God me.