Updated return null lines to throw unsupported exception