Hi, I think it's needed to wrap semaphore usage into finally block in order to avoid deadlock

Hi, I think it's needed to wrap semaphore usage into finally block in order to avoid deadlock #339