Fixing two errors when no meta data is present