Added NPE Protections on convert methods