Better logging and a check for no assets