- Add more error logging to make it more obvious what issues are. - Probably use an env flag for whether to include in build etc.