Added null checking and OUYA Controller