Fix bug where no Location object was returned if initializing took place...

... in the same call.