Info type is inconsistent.
Some error handling.
Type fixes.