More integration, added null trap.