Fixed a couple of exceptions.
Release 0.3.6.1