respect mount_on option and fix nil returns