Cant insert Document in Media Wysiwyg

After a recent upgrade to Media 7.x-2.0-alpha3+80-dev and File Entity 7.x-2.0-alpha3+18-dev its impossible to insert a Document in Wysiwyg.
The popup displays an error and if we dive into the logs its these errors:

EntityMalformedException: Missing bundle in object of type file. i entity_extract_ids() (line 7721 in /MYPATH/includes/common.inc).

Creating default object from empty value i media_file_displays_alter() (line 1036 in /MYPATH/sites/all/modules/media/media.module).

Trying to get property of non-object i file_view_file() (line 226 in /MYPATH/sites/all/modules/file_entity/file_entity.file_api.inc).

Undefined index: #entity i media_wysiwyg_view_mode_form_alter() (line 98 in /MYPATH/sites/all/modules/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.module).

This does not happen with Images, only with Documents (and possibly other types, I don't know).

This is what the form options look like that get passed into the function:

Array
(
    [#type] => fieldset
    [#title] => options
    [format] => Array
        (
            [#type] => select
            [#title] => Display as
            [#options] => Array
                (
                    [default] => Förvald
                    [teaser] => Förhandstitt
                    [preview] => Förhandsgranska
                    [wysiwyg] => WYSIWYG
                )

            [#default_value] => default
            [#description] => Choose the type of display you would like for this
      file. Please be aware that files may display differently than they do when
      they are inserted into an editor.
        )

    [fields] => Array
        (
            [#parents] => Array
                (
                )

            [#pre_render] => Array
                (
                    [0] => _field_extra_fields_pre_render
                )

            [#entity_type] => file
            [#bundle] => testtype
        )

)