Fix more crashes due to holes

@ranjitjhala this fixes the two crashes you discovered, let's see if travis picks up any further problems..