improved build less error handling