ALH: Add better error interface and remove excess lines