Fix fatal error and user construction