R.Gerosa and R.Gerosa Fix for issue 6 (Breaks when no input devices are present)