better management of missing classes