2.3.6

Looks like a patch that was backported wasn't the whole patch... so one last thing before the holiday panic starts!

• Fix a regression from the hardreset fix in 2.3.5
• Add some error checking to the image loader