@@ -521,7 +521,18 @@ export function test_CorrectPropertyValueAfterUsingWrappedValue() {
 
     testObservable.set("property1", wrappedArray);
 
-    TKUnit.assertEqual(testObservable.get("property1"), testArray, "WrappedValue is used only to execute property change logic and unwrapped value should be used as proeprty value.");
+    TKUnit.assertEqual(testObservable.get("property1"), testArray, "WrappedValue is used only to execute property change logic and unwrapped value should be used as property value.");
+}
+
+export function test_CorrectPropertyValueAfterUsingStringEmptyWrappedValue() {
+    const emptyString = "";
+    let testObservable = fromObject({ "property1": emptyString });
+
+    let wrappedEmptyString = WrappedValue.wrap(emptyString);
+
+    testObservable.set("property1", wrappedEmptyString);
+
+    TKUnit.assertEqual(testObservable.get("property1"), emptyString, "WrappedValue is used only to execute property change logic and unwrapped value should be used as property value.");
 }
 
 export function test_NestedObservablesWithObservableArrayShouldNotCrash() {
 
@@ -13,7 +13,7 @@ export class WrappedValue implements WrappedValueDefinition {
     }
 
     public static unwrap(value: any) {
-        return (value && value.wrapped) ? value.wrapped : value;
+        return (value instanceof WrappedValue) ? value.wrapped : value;
     }
 
     public static wrap(value: any) {
@@ -249,4 +249,4 @@ export function fromObjectRecursive(source: any): Observable {
     let observable = new ObservableFromObject();
     addPropertiesFromObject(observable, source, true);
     return observable;
-}
+}
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export class WrappedValue implements WrappedValueDefinition {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public static unwrap(value: any) {`
`16`		`- return (value && value.wrapped) ? value.wrapped : value;`
	`16`	`+ return (value instanceof WrappedValue) ? value.wrapped : value;`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public static wrap(value: any) {`
`@@ -249,4 +249,4 @@ export function fromObjectRecursive(source: any): Observable {`
`249`	`249`	`let observable = new ObservableFromObject();`
`250`	`250`	`addPropertiesFromObject(observable, source, true);`
`251`	`251`	`return observable;`
`252`		`-}`
	`252`	`+}`