Prevent deadlocks from hanging service - closes #20

These are the issues I've found with the service code, that help resolve hangs in our environment.  Wanted to get this up for review new - will follow up tomorrow.