This is fixing a crash reported by Nico. Somehow I staged an unfinished version of this code. The crash should be gone.