Additions to account for the problems arise during parsing of psi-mi databases.