Added safeguards against no input devices