fix #2 and #5 of April 17
merge with exceptionhandling on remote