Fixed NullPointer
Merge remote-tracking branch 'origin/defusecleanup' into defusecleanup