Fix issue 23

These two places helped me tracking some helpful error information that Google reported. Maybe this can also be applied to other places to help users figuring out issues.