Prevents a crash due to nil NSError pointer
Merge remote-tracking branch 'origin/develop' into issues/208-performance