Add autoOrient option
Add null pointer protection to set methods