Minor fixes
More verbose error logging