A couple of fixes with logging and generic errors