Add better parent exception handling