Added some exceptions before switching computers. Hoping to catch #12
added more exceptions and more tests, still kind find bug that causes #12
Merge pull request #13 from openpowerquality/12

12