Return an optional instead of casting -1 into an enum

Return an optional instead of casting -1 into an enum #195