CE-908: redundant return statements removed

Just removed unneeded return statements after exceptions.