Make error handling consistent
Should not change any behavior, mainly fixes inconsistencies, overcomplicated code/error handling and removed unneeded logging
Should not change any behavior, mainly fixes inconsistencies, overcomplicated code/error handling and removed unneeded logging