Remove unnecessary return
Test unwrap exception for Hibernate