few error checking changes
something
something else