Added a bit better error messages