Fixed cs and exceptions messages