[BUGFIX] Fixed handling of empty property