Attempt to fix occasional crash on startup.
Merge pull request #14 from emediate/unstable

Attempt to fix occasional crash on startup.