refactoring of converter code. adding null check. add boost unit test coverage to 83%