Fix error and warning texts
Merge pull request #2 from nightkin/master

Fix error and warning texts