Added a couple of checks for save modules