Error Checking, View refresh added