Fixed the bug that existed with null values and null strings...
Source Class changed a bit...
Fixed the problem with null strings and null types of property tag...