Added in some better error messages