Merge pull request #131 from cherba/mock_test

Do not raise exception in client mock if one already active.