The fix just throws an InstantiationException if the Klass is NULL. Reviewed-by: coleenp, twisti, jrose