Fixed bug and improved error handling in early startup sequence.
Fixed bug and improved error handling in early startup sequence.

pombredanne/paperpile,jondo/paperpile,jondo/paperpile,pombredanne/paperpile,jondo/paperpile,jondo/paperpile,jondo/paperpile,pombredanne/paperpile,pombredanne/paperpile,pombredanne/paperpile