fixes

add Error message and bypass function