Fix issue #28
Merge pull request #30 from MichaelAz/system_error

Fix issue #28