error in folders.php

Hey,

Firstly great plugin. Very easy to keep things organized with so thanks

I believe there is an error in the below code in folder.php and the checks in the second if statement should be the other way around. Otherwise it creates and exception warning:

Exception has occurred.
Warning: Attempt to read property “id” on null

 public function attachment_fields_to_edit($form_fields, $post) {
    
    $screen = null;
    if (function_exists('get_current_screen')) {
      $screen = get_current_screen();

      if ('attachment' === $screen->id && !is_null($screen)) {
        return $form_fields;
      }
    }

Also, do you know if the plugin should be set up to handle loading images over https correctly? I seem to be getting mixed content errors

Mixed Content: The page at ‘<URL>’ was loaded over HTTPS, but requested an insecure element ‘<URL>’. This request was automatically upgraded to HTTPS, For more information see <URL>

It’s possible it’s something on my end but I don’t think so…