Bug Fix: Don't try to add a class to a non-existing list