Added array checking to swing and option requests