Merge commit '2d743fe2f39397d41334001d897eb78da56e94ef' into kraken * commit '2d743fe2f39397d41334001d897eb78da56e94ef': Add better error handling for savePicture and restorePicture
Merge commit '2d743fe2f39397d41334001d897eb78da56e94ef' into kraken * commit '2d743fe2f39397d41334001d897eb78da56e94ef': Add better error handling for savePicture and restorePicture