add expectations
fix nil error if no remote configured