Commit 0beb7fe42726671304161a1aecee4924617b7c96

Jacques Germishuys 2014-12-24T11:44:17

Added missing error handling path