Merge "Changing code to have better error logging"