Solved Issue #7 and insert some error detections