Better handling for invalid scm types