Be more robust to invalid build requests