Added some better error messages