Fix crashes due to improper address entry