Error message improvements

Handling new scenarios, simplifying some messages.