More cleanup, null check in Dispatcher call