Null Exception Partly Solved