Cleanup.
Better error description (related to bug 605).