Maybe better to return null and just throw exception ?