Projections and error handling improvements