Handle the case when there is no armory + minor fixes