diff --git a/src/eval_context.rs b/src/eval_context.rs
index c704ab230d58..f364f829f903 100644
--- a/src/eval_context.rs
+++ b/src/eval_context.rs
@@ -453,7 +453,7 @@ pub fn push_stack_frame(
     ) -> EvalResult<'tcx> {
         ::log_settings::settings().indentation += 1;
 
-        /// Return the set of locals that have a stroage annotation anywhere
+        /// Return the set of locals that have a storage annotation anywhere
         fn collect_storage_annotations<'tcx>(mir: &'tcx mir::Mir<'tcx>) -> HashSet<mir::Local> {
             use rustc::mir::StatementKind::*;
 
@@ -475,10 +475,12 @@ fn collect_storage_annotations<'tcx>(mir: &'tcx mir::Mir<'tcx>) -> HashSet<mir::
         // `Value` for that.
         let annotated_locals = collect_storage_annotations(mir);
         let num_locals = mir.local_decls.len() - 1;
-        let mut locals = Vec::with_capacity(num_locals);
+        let mut locals = vec![None; num_locals];
         for i in 0..num_locals {
             let local = mir::Local::new(i+1);
-            locals.push(if annotated_locals.contains(&local) { None } else { Some(Value::ByVal(PrimVal::Undef)) });
+            if !annotated_locals.contains(&local) {
+                locals[i] = Some(Value::ByVal(PrimVal::Undef));
+            }
         }
 
         self.stack.push(Frame {
diff --git a/src/lvalue.rs b/src/lvalue.rs
index a09f72134e9d..ce0651bf1291 100644
--- a/src/lvalue.rs
+++ b/src/lvalue.rs
@@ -130,7 +130,7 @@ pub(super) fn eval_and_read_lvalue(&mut self, lvalue: &mir::Lvalue<'tcx>) -> Eva
                 Ok(Value::ByRef(ptr))
             }
             Lvalue::Local { frame, local, field } => {
-                Ok(self.stack[frame].get_local(local, field.map(|(i, _)| i))?)
+                self.stack[frame].get_local(local, field.map(|(i, _)| i))
             }
             Lvalue::Global(cid) => {
                 Ok(self.globals.get(&cid).expect("global not cached").value)