Check for instanceof Responder instead of only is_object
Merged master