Fixed nil exception introduced by metadata change