[TASK] Add early return to avoid PHP warnings for NULL values
[TASK] Inherit relocated class
[TASK] Incorrect exception message