Adding some exception logic per issue #1