This should match the previous behaviour and fix crashes when these properties don't exist.
Tested with a htc-primou bootimg.
Fixes 826bb4f2