Cleaned up abe's code

Exception instead of ...strange default