Logger + error improvements