Minor change: added missing error messages and improved the english
message