Issue #887/#888

The PR includes fixes for #887 and #888 (file vesron).
It's intentional. The first time, we check if it exists on start, but in property change listener we test if it still exists.