Fixed error messages and stability