Inserted null-checks
First upgrade of listener succeeds
Changed the request listener hierarchy