Merge pull request #551 from pekabon/NotNullOrEmpty2
#551 Add test. Make message similar to NotNull macro.
Closes #552 Synchronize VS2008 with recent changes.