removed null handler