More explicit errors

And more checks