Cleanup: Fix bug where unblock_external always raised an exception