Updated descriptor handling in session controller

Signed-off-by: Tom Wright <tom@inflatablecookie.com>