Adding missing exception handling. Updating versions.