Replaced error messages with status messages. Merged with 2f4089b