better handling of nil model