Added exceptions for entities that do not exist