- handle null model

- kitchensink bugfix