More debug messages and error proofness.