Temporary fix: The given id must not be null