screen rotation NPE issues fixed