Fixed Return Methods and Null Pointer in Retreat