[BUGFIX beta] Provide better debugging information.