Ensure critial sections are released before returning

https://bugzilla.gnome.org/show_bug.cgi?id=734035