Made some changes and resolved a couple of errors

but there still seems to be a problem with null values in the
constructors. It looks like the constructor does not like a null value
being passed for the database path variable