Looks like I need to handle void.class and Void.class both