Added an exception for null model names