Null Pointer on Edit Fixes