Handle non-existent package better