Do not add duplicated handlers
Ensure proper whereis expansion