Added return null to exceptions