Error messages improved.