Working commit, error message examples added.