Call orphan code and improve helper robustness