Fix ||= assignment runtime errors

Fix ||= assignment runtime errors in two places as mentioned in #13 and #8.