Including missing file and improving consistency when throwing
exceptions