Fixed NPE because of missing return