Fix: properties might be null