Should fix #39 now!
Removed the unnecessary Exception throw
Should fix #37
Fixed up a few potential problems