Added more error definitions and fixed message definition.