Addresses #3 - produced deadlock by bad user code