better error handling for prep and prep-deploy