fix
better error messages